Updated chapter 2