Changes to Task 6