Task 3.2 100% coded