Escalation refactored