Task 2 partially done