Chapter 9 tweaks