Finished task 7 and 8