Manually added MMP changes