More changes to the HQM