project2 with final edits