Task 3.5 3.6 improved