Assigment 02 solved