Updated to complete project 1