Fixed after Andrew's review
Merge branch 'task3' into task4