HWA improvements