Task 11 changes