Changes for hydro compatibility