More work to chapter 6 draft