Fix task 3 and 5