Some changes to hwm