some changes on chapter 3