Task7

with fixes