Task 07 solved