closer to working collision resolution