Diana adding part 2 of assignment 1