Final changes for chapter 5