Adding milestone 11 changes