[Chapter 6] edits