Revert "Revert "Update mp.hpp""

This reverts commit 2f96dd2050f9f7ec0786b1b83dd85add9ff526ec.