update chapter 1 - 7