Complete conversion of Chapter 6.