Implemented changes for Week 7 HW