Collision model redone