refactored collisionManager