task 5, 6 and 7 updated