Chapter 7 restructured to be more like Shiffman's book (bonus examples removed)