Assignment 7 solved