Revert "Revert "Revert "Add a new rr"""

This reverts commit 11fb2a66e1ccee22fe715b7f38d67e3803615502.