now with collision detection again