Updated with code for project 1