--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationMainValuesQFacet.java	Wed Oct 09 15:58:46 2019 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationMainValuesQFacet.java	Wed Oct 09 16:17:16 2019 +0200
@@ -17,29 +17,34 @@
 import org.dive4elements.artifacts.Artifact;
 import org.dive4elements.artifacts.CallContext;
 import org.dive4elements.river.artifacts.D4EArtifact;
+import org.dive4elements.river.artifacts.model.Calculation;
 import org.dive4elements.river.artifacts.model.CalculationResult;
+import org.dive4elements.river.artifacts.sinfo.flood_duration.FloodDurationCalculationResult.Infrastructure;
 import org.dive4elements.river.artifacts.states.DefaultState.ComputeType;
 import org.dive4elements.river.exports.fixings.FixChartGenerator;
 import org.dive4elements.river.jfree.RiverAnnotation;
 import org.dive4elements.river.jfree.StickyAxisAnnotation;
 
-
 /**
  * Facet to show Main Q Values.
  */
 public class FloodDurationMainValuesQFacet extends DefaultFacet {
 
+    private static final long serialVersionUID = 1L;
+
     /** Own log. */
     private static Logger log = Logger.getLogger(FloodDurationMainValuesQFacet.class);
 
+    private final Infrastructure m_infrastructure;
+
     /** Trivial Constructor. */
-    public FloodDurationMainValuesQFacet(final String name, final String description) {
+    public FloodDurationMainValuesQFacet(final String name, final String description, final int facetIndex, final Infrastructure infrastructure) {
         this.description = description;
         this.name = name;
-        this.index = 1;
+        this.index = facetIndex;
+        this.m_infrastructure = infrastructure;
     }
 
-
     /**
      * Returns the data this facet requires.
      */
@@ -56,21 +61,25 @@
 
         final double currentKm = FixChartGenerator.getCurrentKm(context);
 
-        final List<StickyAxisAnnotation> annotations = new FloodDurationCalculation(context).calcMainValueQAnnotations(currentKm,
-                data.getResults().get(0));
+        final FloodDurationCalculationResult result = data.getResults().get(0);
+
+        final Calculation problems = new Calculation();
+
+        final FacetCalculator calculator = new FacetCalculator(context);
+        final List<StickyAxisAnnotation> annotations = calculator.calcMainValueQAnnotations(problems, currentKm, result);
 
         return new RiverAnnotation(this.description, annotations);
     }
 
-
     /**
      * Create a deep copy of this Facet.
+     *
      * @return a deep copy.
      */
     @Override
     public FloodDurationMainValuesQFacet deepCopy() {
-        final FloodDurationMainValuesQFacet copy = new FloodDurationMainValuesQFacet(this.name, this.description);
+        final FloodDurationMainValuesQFacet copy = new FloodDurationMainValuesQFacet(this.name, this.description, this.index, this.m_infrastructure);
         copy.set(this);
         return copy;
     }
-}
+}
\ No newline at end of file