Adding Milestone 4 changes