modified Lesson06 to Lesson07