bringin updates from hydro_dev