Fixed chapters 1 and 2