Integrate edits for chapter 8