updated rh_calculator to use the utility class