Another pass over chapter 16