Working on MFT upgrade