Pre-class fixes
Lesson 16
Good