21.1, w.2, corrections per Matt