Integrate editing for Chapter 16