Smart sync (13/41)

Smart sync