update chapter 1, 2, 5