Diff of MMB onto refactor

Just to see the diff clearly.