more mmc changes