Made Task 7 and 8 optional