update to tasks 6 & 7