Added milestone and other changes