collision detection reimplemented, hopefully