Task 2 improvements