improve chapter 2 and chapter 3