[Chapter 6] more edits