update to rcf codebase