Add changes proposed in the exercises of chapter 7