Updated to match HWv2