finish part 2.2