New: auto-safety