Made the collision events more general.