Updated chapter 6