Updates for chapter 4