made collision resolution much better