Update M2 report and M3's template