Milestone 1 changes