Detector
UPDATED