Attempted to simplify the detector.