added chapter 6 and 15