Did some work to the collider class