Re-add cmhw