Switch to M2