Completed part 2 of the assignment