added chapter 2 & 3