Task 3 bugfix
Added Task 6