cSF: some changes.