added tasks 6,7 (unfinished)