fix mm calls, should be a list
fixed conflict, reorg