updated for Team-Hydra changes