Refactored RR Quantum