Task 2 updated
fixes