Task 05 solved