updates from hydro_dev

Indigo dev