Working on core tweaks for mmp