More stuff on chapter 2