Added milestone 2 and 3