more tweaks for hydra implementation