tasks 5-6 fixed