`-M` now back to usually functionality, but more general