Smart sync (18/41)

Smart sync