Completed Changes for Project 1