Assigment 2 solved