final changes for Project 1