Integrate edits for chapter 9