Added MFFS, fixed item conflicts