Part of task 7