HAH tweaks for demo