Added viscosity, made two epsilon values distinct