RH- ?param refactoring