Rework of Chapter 8.2