Smart sync (30/41)

Smart sync