More work on hydro packages.