Week 8, Assignment 7 solution implemented