diff --git a/demos/qmlf1legends/qml/qmlf1legends/SpeedsXml.qml b/demos/qmlf1legends/qml/qmlf1legends/SpeedsXml.qml
index c354ea2..a12a67e 100644
--- a/demos/qmlf1legends/qml/qmlf1legends/SpeedsXml.qml
+++ b/demos/qmlf1legends/qml/qmlf1legends/SpeedsXml.qml
@@ -25,9 +25,9 @@ XmlListModel {
     // Hard-coded test data
     xml: "<results><row><speedTrap>0</speedTrap><driver>Fittipaldi</driver><speed>104.12</speed></row>"
         +"<row><speedTrap>0</speedTrap><driver>Stewart</driver><speed>106.12</speed></row>"
-        // ...
-//![1]
         +"<row><speedTrap>0</speedTrap><driver>Hunt</driver><speed>106.12</speed></row>"
+    // ...
+//![1]
         +"<row><speedTrap>1</speedTrap><driver>Fittipaldi</driver><speed>115.12</speed></row>"
         +"<row><speedTrap>1</speedTrap><driver>Stewart</driver><speed>114.12</speed></row>"
         +"<row><speedTrap>1</speedTrap><driver>Hunt</driver><speed>115.12</speed></row>"
diff --git a/demos/qmlf1legends/qml/qmlf1legends/main.qml b/demos/qmlf1legends/qml/qmlf1legends/main.qml
index b172b99..d8a937a 100644
--- a/demos/qmlf1legends/qml/qmlf1legends/main.qml
+++ b/demos/qmlf1legends/qml/qmlf1legends/main.qml
@@ -64,23 +64,28 @@ Rectangle {
                 if (!lineSeries) {
                     lineSeries = chartView.createSeries(ChartView.SeriesTypeLine, speedsXml.get(currentIndex).driver);
                     chartView.axisY().min = 0;
-                    chartView.axisY().max = 250
+                    chartView.axisY().max = 250;
+                    chartView.axisY().tickCount = 6;
+                    chartView.axisY().title = "speed (kph)";
+                    chartView.axisX().title = "speed trap";
+                    chartView.axisX().labelFormat = "%.0f";
                 }
-                lineSeries.append(currentIndex, speedsXml.get(currentIndex).speed);
+                lineSeries.append(speedsXml.get(currentIndex).speedTrap, speedsXml.get(currentIndex).speed);
 
-                // Make the x-axis range dynamic
-                if (currentIndex > 9)
-                    chartView.axisX().min = currentIndex - 10;
-                else
+                if (speedsXml.get(currentIndex).speedTrap > 3) {
+                    chartView.axisX().max = Number(speedsXml.get(currentIndex).speedTrap) + 1;
+                    chartView.axisX().min = chartView.axisX().max - 5;
+                } else {
+                    chartView.axisX().max = 5;
                     chartView.axisX().min = 0;
-
-                chartView.axisX().max = currentIndex + 1;
+                }
+                chartView.axisX().tickCount = chartView.axisX().max - chartView.axisX().min + 1;
             } else {
                 // No more data, change x-axis range to show all the data
                 timer.stop();
                 chartView.animationOptions = ChartView.AllAnimations;
                 chartView.axisX().min = 0;
-                chartView.axisX().max = currentIndex + 1;
+                chartView.axisX().max = speedsXml.get(currentIndex - 1).speedTrap;
             }
         }
     }