Adding milestone 10 changes