More work on chapter 1