21.2, Matt's corrections