Added Task 6 and 7