Added tasks 6-7