Upgraded hydra and sufia