Commented code for hydro version