Finish first pass through 9.2.2