improved collision detection more