Final commit for chapter 6