A better version of McMMO