Polishing up chapter 2