Revise take-over-mechanism