Updated adaptive RH routine