ifm changes for performance enhancements