changing this shit again (units of hf_surr changed