Better Collision logic