changed m2 code to work with M2 1.6