Reworking chapter 1 again.