Update for chapter 7 and 8