Changes to project 2 from class 6