Other changes for chapter 9