Assignment2, second commit