Ibft improvements