Assigment 2 resolved