Migrate also item 3 to use operations