Better mm handling