Task 1 and Task 2 changes