Task 6 more improvements