collision handling modified