Update to no longer take MF as an argument