Worked on part 2