Tasks 6 -7 finished