Changes for lecture 16 and 17.