Add Chapter 17 and 18