Task 3.1 is done