Added improved collision