Solved part 2