Better collision detection