Part 2 of assignment