Incorporate patches to chapter 1, and the add chapter 5
Incorporate patches to chapter 1, and the add chapter 5