RFR improvements