More tweaks to the MD