significant improvements to the HW calc