Adding changes for Chapter 8