[Chapter 7] edits