--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthCalculationResult.java	Thu Jun 21 10:41:55 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthCalculationResult.java	Thu Jun 21 14:32:11 2018 +0200
@@ -12,11 +12,11 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.dive4elements.river.artifacts.common.AbstractCalculationExportableResult;
 import org.dive4elements.river.artifacts.common.ExportContextCSV;
 import org.dive4elements.river.artifacts.common.GeneralResultType;
 import org.dive4elements.river.artifacts.common.MetaAndTableJRDataSource;
 import org.dive4elements.river.artifacts.common.ResultRow;
+import org.dive4elements.river.artifacts.sinfo.common.AbstractTkhCalculationResult;
 import org.dive4elements.river.artifacts.sinfo.common.SInfoResultType;
 import org.dive4elements.river.artifacts.sinfo.util.BedHeightInfo;
 import org.dive4elements.river.artifacts.sinfo.util.RiverInfo;
@@ -27,7 +27,8 @@
  *
  * @author Gernot Belger
  */
-final class FlowDepthCalculationResult extends AbstractCalculationExportableResult<FlowDepthCalculationResults> {
+
+final class FlowDepthCalculationResult extends AbstractTkhCalculationResult<FlowDepthCalculationResults> {
 
     private static final long serialVersionUID = 1L;
 
@@ -38,16 +39,13 @@
     private static final String JASPER_FILE = "/jasper/templates/sinfo.flowdepth.jrxml"; // TODO use jrxml-path all over the project
 
     private final BedHeightInfo sounding;
-    private final WstInfo wst;
-    private final boolean hasTkh;
 
     public FlowDepthCalculationResult(final String label, final WstInfo wst, final BedHeightInfo sounding, final boolean hasTkh,
             final Collection<ResultRow> rows) {
-        super(label, rows);
+        super(label, wst, hasTkh, rows);
 
         this.sounding = sounding;
-        this.wst = wst;
-        this.hasTkh = hasTkh;
+
     }
 
     public BedHeightInfo getSounding() {
@@ -87,7 +85,7 @@
 
         exportContextCSV.writeBlankLine();// .writeNext(new String[] { "" }); // break line
 
-        exportContextCSV.writeCSVWaterlevelMetadata(this.wst);
+        exportContextCSV.writeCSVWaterlevelMetadata(super.getWst()); // TODO move to super
 
         exportContextCSV.writeBlankLine();// .writeNext(new String[] { "" }); // break line
 
@@ -126,10 +124,6 @@
         exportContextPDF.addJRMetadata(source, "location_header", SInfoResultType.location);
     }
 
-    public boolean hasTkh() {
-        return this.hasTkh;
-    }
-
     private String[] formatRow(final ExportMode mode, final ExportContextCSV exportContextCSV, final FlowDepthCalculationResults results, final ResultRow row) {
 
         final Collection<String> lines = new ArrayList<>(11);