some more HWs updates