Working on MMC1 issues