Applied new method of collision handling. That still doesn't work.