WADI

refactor evacuation protocol