Much improved collision
Minor tweak