Add changes for Chapter 8 exercises