Task 6 changes