Task 6 improvements