Week 7 solved earlier