Task 2 & 3 completed