making changes for upgrade to kfs 3