Task 3(last fix)