Complete chapter 6 and add chapter 7