Some adjusts in chapter 04.