updated for chapter 7