Task 04 solved