Changed order of second half; added in-class challenge