apply minor changes similar to m1