Smart sync (3/41)

Smart sync