Adding Milestone 6 changes