changes for latest sfa