fixed stuff for task 2