Changed stuff for task 17. (Still wrong results...)