Final changes to tasks 4 and 5