Initial modification for MPEX