fixing task 1
fixing task 3