add better detections