Adding chapter 6 changes