Task 2.4 100% coded