Updates for chapter 2 and 3