Include editorial changes from Coutant in Chapter 6 and 7