Updates for chapter 7