incorporate changes to chapter 2