Many changes to Part 2, including d |--> n.