Updated for chapter 5