prepare for m2 too