Refactored r.h.