Project Part 2 fixed up