slight updates - more .mm