Reasonable go at fixing up the collision visiblity feature