Redone chapter 3.1