Added collision checking for parts of the goal