Updates with solution

As per assignment 2 details