some changes to m2