Updated task 7