Slightly improved collision, still wrong though.