Add changes from exercises of chapter 5