Add Tasks06 & Task07