Collider Class Updated and perfected