[Chapter 7] more edits