s.2, s.3, s.4 corrections per Matt