merged CollisionModel and added a few functions