Milestone 7 migration