sync with master : add emergency