Add chapter 15 and 16