Implement changes suggested in the exercises of chapter 9