Changes from TODO, generated lesson 2014-09-18