Task 2.1 is fixed
Task 2.2 is fixed