--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhCalculation.java	Tue Mar 13 09:55:53 2018 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhCalculation.java	Tue Mar 13 18:49:33 2018 +0100
@@ -31,6 +31,7 @@
 import org.dive4elements.river.artifacts.sinfo.tkhcalculation.DischargeValuesFinder;
 import org.dive4elements.river.artifacts.sinfo.tkhcalculation.Tkh;
 import org.dive4elements.river.artifacts.sinfo.tkhcalculation.TkhCalculator;
+import org.dive4elements.river.artifacts.sinfo.tkhcalculation.WaterlevelValuesFinder;
 import org.dive4elements.river.artifacts.sinfo.util.BedHeightInfo;
 import org.dive4elements.river.artifacts.sinfo.util.CalculationUtils;
 import org.dive4elements.river.artifacts.sinfo.util.RiverInfo;
@@ -143,14 +144,13 @@
         for (int i = 0; i < size; i++) {
 
             final double station = wkms.getKm(i);
-            final double wst = wkms.getW(i);
 
             /* find the right calculator (i.e. bedheigh) depending on station, there should only be one maximal */
             final TkhCalculator tkhCalculator = findCalculator(calculatorsByRanges, station);
             if (tkhCalculator == null)
                 continue;
 
-            final Tkh tkh = tkhCalculator.getTkh(station, wst);
+            final Tkh tkh = tkhCalculator.getTkh(station);
 
             final String description = descBuilder.getDesc(wkms);
             final String gaugeLabel = riverInfoProvider.findGauge(station);
@@ -185,11 +185,12 @@
 
             final NumberRange range = new NumberRange(info.getFrom(), info.getTo());
 
+            final WaterlevelValuesFinder waterlevelProvider = WaterlevelValuesFinder.fromKms(wkms);
             final DischargeValuesFinder dischargeProvider = DischargeValuesFinder.fromKms(wkms);
 
             /* initialize tkh calculator */
             final TkhCalculator tkhCalculator = TkhCalculator.buildTkhCalculator(true, this.context, problems, wstLabel, riverInfoProvider.getRiver(),
-                    calcRange, dischargeProvider, bedHeightsProvider);
+                    calcRange, waterlevelProvider, dischargeProvider, bedHeightsProvider);
 
             if (tkhCalculator != null) {
                 /* just ignore null ones, problems have already been updated by buildTkhCalculator() */