rbc refactored