Updated for chapter 8