removed the mm shortcut
commit other updates