some changes for hydra machines