Task 7 and 8 redone