Lessons 17 and 18 added