chapter 7 edits (still working on this)