updates from hydro_dev