updated to latest HWR