Integrate edits for chapter 11