Updated MFT code. Fixed .23 issues