Final commit for chapter 5