Imporved Collision Detection