Cleaned up MFR Compatibility...

AKA actually implement it properly :V