Updating Milestone 6 changes