Added tasks 7 and 8