collision detection seems to work now