Smart sync (16/41)

Smart sync