Final commit for the chapter 4