updated to chapter 2