Updated RHF scripts