Task7

with fixes #2