Smart sync (4/41)

Smart sync