Updated to HCM-MPM