Lesson 12 and 13 improvements