chapter 2
some fix