Updated with ParanoidDetector