Better collision detection - #5