Smart sync (22/41)

Smart sync