lots of changes to keep up with hydrodynamics demo