Started major overhaul on chapter 3