New: self-detection