collision changes
omfg hamish