refactor rc