Assignment 2 solved