diff --git a/dist/vis.js b/dist/vis.js
index 140a1682..9001434f 100644
--- a/dist/vis.js
+++ b/dist/vis.js
@@ -3660,6 +3660,13 @@ Linegraph.prototype.setOptions = function(options) {
         this.legendRight.setOptions(this.options.legend);
       }
     }
+
+    if (this.groups.hasOwnProperty(UNGROUPED)) {
+      this.groups[UNGROUPED].setOptions(options);
+    }
+  }
+  if (this.dom.frame) {
+    this._updateGraph();
   }
 };
 
@@ -4197,6 +4204,7 @@ Linegraph.prototype._prepareData = function (datapoints, options) {
   if (options.yAxisOrientation == 'right') {
     axis = this.yAxisRight;
   }
+
   for (var i = 0; i < datapoints.length; i++) {
     xValue = Math.round(toScreen(datapoints[i].x) + this.width - 1);
     yValue = Math.round(axis.convertValue(datapoints[i].y));
diff --git a/examples/graph2d/08_performance.html b/examples/graph2d/08_performance.html
index d9fbb923..13c559e9 100644
--- a/examples/graph2d/08_performance.html
+++ b/examples/graph2d/08_performance.html
@@ -19,62 +19,65 @@
 <body>
 <h2>Graph2D | Performance</h2>
 <div style="width:700px; font-size:14px; text-align: justify;">
-    This example shows the some of the graphs outlined on the right side using the <code>yAxisOrientation</code> option within the groups.
-    We also show a few more custom styles for the graphs. Finally, the legend is manually positioned. Both the left and right axis
-    have their own legend. If one of the axis is unused, the legend is not shown. The options for the legend have been split
-    in a <code>left</code> and a <code>right</code> segment. The default position of the left axis has been changed.
-
-
+    This example is a test of the performance of the Graph2D. Select the amount of datapoints you want to plot and press draw.
+    You can choose between the style of the points as well as the interpolation method. This can only be toggled with the buttons.
 </div>
 <br />
 <p>
     <label for="count">Number of items</label>
     <input id="count" value="100">
-    <input id="draw" type="button" value="draw">
     <input id="toggleInterpolation" type="button" value="toggle Interpolation">
+    Interpolation method: <input id="interpolation" value="linear">
     <input id="togglePoints" type="button" value="toggle Points">
+    Points style: <input id="points" value="none"> <br/>
+    <input id="draw" type="button" value="draw" style="width:200px;">
 </p>
 <div id="visualization"></div>
 
 <script>
-    var points = '';
-    var interpolation = '';
+    var points = 'none';
+    var interpolation = 'linear';
 
     function togglePoints() {
         var pointsOptions = {};
-        if (points == "") {
+        var pointsField = document.getElementById("points");
+        if (points == "none") {
             points = 'circle';
-            pointsOptions = {drawPoints: {style: 'circle'}};
+            pointsOptions = {drawPoints: {style: points}};
         }
         else if (points == "circle") {
             points = 'square';
-            pointsOptions = {drawPoints: {style: 'square'}};
+            pointsOptions = {drawPoints: {style: points}};
         }
         else if (points == "square") {
-            points = '';
+            points = 'none';
             pointsOptions = {drawPoints: false};
         }
+        pointsField.value = points;
+
         graph2D.setOptions(pointsOptions);
     }
 
     function toggleInterpolation() {
         var interpolationOptions = {};
-        if (interpolation == "") {
+        var interpolationField = document.getElementById("interpolation");
+        if (interpolation == "linear") {
             interpolation = 'centripetal';
-            interpolationOptions = {drawPoints: {style: 'circle'}};
+            interpolationOptions = {catmullRom: {parametrization: interpolation}};
         }
-        else if (interpolation == "circle") {
+        else if (interpolation == "centripetal") {
             interpolation = 'chordal';
-            interpolationOptions = {drawPoints: {style: 'square'}};
+            interpolationOptions = {catmullRom: {parametrization: interpolation}};
         }
-        else if (interpolation == "square") {
+        else if (interpolation == "chordal") {
             interpolation = 'uniform';
-            interpolationOptions = {drawPoints: false};
+            interpolationOptions = {catmullRom: {parametrization: interpolation}};
         }
-        else if (interpolation == "square") {
-            interpolation = '';
-            interpolationOptions = {drawPoints: false};
+        else if (interpolation == "uniform") {
+            interpolation = 'linear';
+            interpolationOptions = {catmullRom: false};
         }
+        interpolationField.value = interpolation;
         graph2D.setOptions(interpolationOptions);
     }
 
@@ -101,11 +104,13 @@
     createData();
 
     document.getElementById('draw').onclick = createData;
-    document.getElementById('toggleInterpolation').onclick = createData;
-    document.getElementById('togglePoints').onclick = createData;
+    document.getElementById('toggleInterpolation').onclick = toggleInterpolation;
+    document.getElementById('togglePoints').onclick = togglePoints;
 
     var container = document.getElementById('visualization');
     var options = {
+        drawPoints: false,
+        catmullRom: false,
         start: startPoint,
         end: endPoint
     };
diff --git a/src/timeline/component/Linegraph.js b/src/timeline/component/Linegraph.js
index e92de576..0eb64df4 100644
--- a/src/timeline/component/Linegraph.js
+++ b/src/timeline/component/Linegraph.js
@@ -190,6 +190,13 @@ Linegraph.prototype.setOptions = function(options) {
         this.legendRight.setOptions(this.options.legend);
       }
     }
+
+    if (this.groups.hasOwnProperty(UNGROUPED)) {
+      this.groups[UNGROUPED].setOptions(options);
+    }
+  }
+  if (this.dom.frame) {
+    this._updateGraph();
   }
 };
 
@@ -727,6 +734,7 @@ Linegraph.prototype._prepareData = function (datapoints, options) {
   if (options.yAxisOrientation == 'right') {
     axis = this.yAxisRight;
   }
+
   for (var i = 0; i < datapoints.length; i++) {
     xValue = Math.round(toScreen(datapoints[i].x) + this.width - 1);
     yValue = Math.round(axis.convertValue(datapoints[i].y));
