Fixed chapter 1 and 2