Small fixes to task. Still not working..