Chapter 8: updated
Chapter 10: Updated