Updates for chapter 1 and chapter 2