More changes before turn in for Project 2