Smart sync (25/41)

Smart sync