[#5] Revamp Lesson 8.