Task 06 and Task 07 done