More changes to coincide with the migration