Adding milestone 13 changes