final changes for chapter 2