Adding Milestone 12 changes