changing DHQ logic