Tasks 04 and 05 solved