Updated chapter 7