mmc: updated from jb_mr1_chocolate