improved collision handling again