Rewrote exps/mpm.py combining YJ and JK methods