FFIM modifications