Additional updates to chapter 6