re-add the very necessary CMHW stuff