More work on chapter 04