made collision resolution a parameter