Final chapter 3 commit