Final commit for chapter 3