Updated based on Lesson 7 from ed2go class