Improvements for #134 - HARs turn around better