Add changes for Chapter 9.