fix 4 and full task 5