Migrating most changes - still need to do news control 2