Fixing chapter 2