Commit task 11 and edit task 8 and 9