some changes in chapter 1 and 5