RRFC redesign