Fixes in task5 and task5
[+] Task7