Allow for RP to be set to 'NONE'