Task6

with fixes