Smart sync (24/41)

Smart sync