Assignment2 changes