Rearanged chapter 3.2, more content