refactored ORS, CRP update