Changes from chapter 7