Replace EAP with MP