modified chapter 1, chapter 2 added