second commit of m.hata mac