--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java	Mon Feb 26 18:10:03 2018 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java	Tue Feb 27 18:06:52 2018 +0100
@@ -20,7 +20,7 @@
 
 import org.dive4elements.river.artifacts.access.Calculation4Access;
 import org.dive4elements.river.artifacts.access.RangeAccess;
-
+import org.dive4elements.river.artifacts.access.ComputationRangeAccess;
 import org.dive4elements.river.artifacts.geom.Lines;
 
 import org.dive4elements.river.artifacts.model.Calculation1;
@@ -808,48 +808,13 @@
      * @return the selected kms.
      */
     public double[] getKms() {
-        RangeAccess rangeAccess = new RangeAccess(this);
-        if (rangeAccess.isRange()) {
-            return rangeAccess.getKmSteps();
-        }
-        else {
-            return LocationDistanceSelect.getLocations(this);
-        }
+        return new ComputationRangeAccess(this).getKms();
     }
 
-
     public double [] getFromToStep() {
-        RangeAccess rangeAccess = new RangeAccess(this);
-        if (!rangeAccess.isRange()) {
-            return null;
-        }
-        double [] fromTo = rangeAccess.getKmRange();
-
-        if (fromTo == null) {
-            return null;
-        }
-
-        StateData dStep = getData("ld_step");
-        if (dStep == null) {
-            return null;
-        }
-
-        double [] result = new double[3];
-        result[0] = fromTo[0];
-        result[1] = fromTo[1];
-
-        try {
-            String step = (String)dStep.getValue();
-            result[2] = DoubleUtil.round(Double.parseDouble(step) / 1000d);
-        }
-        catch (NumberFormatException nfe) {
-            return null;
-        }
-
-        return result;
+        return new ComputationRangeAccess(this).getFromToStep();
     }
 
-
     /**
      * This method returns the Q values.
      *