Task 7_1 completed
Task 7_2 fixed