First cut of Chapter 2.4