Improved the collision model