Final changes for Chapter 6