add all changes for Project 1