More Chapter 9 changes