Improved collision response