Not needed anymore for mhwd