Update for hw

Update for hw