17.1 & 17.2, corrections per Matt