tasks 6 and 7 added