added equations for water/ice