Chapter 8 edits