Wrapping up step2 part1