diff --git a/index.haml b/index.haml
index 09bb7b5..2a28300 100644
--- a/index.haml
+++ b/index.haml
@@ -24,19 +24,17 @@
       var mychart = new d3_tsline("#chart");
 
       // override format_data function, taking json payload and creating
-      // 2-arrays as data points in a series.  Return an array of series
+      // 2-arrays as data points in a series.  Return an array of one series
       mychart.format_data = function(data) {
           var series = [];
-          data.forEach(function(json) {
+          data[0].forEach(function(json) {
               series.push([json.date, json.val]);
           });
           return [ series ];
       };
 
       // override parse_date function to handle our data's date format
-      mychart.parse_date = function(dt) {
-          d3.time.format("%b %d, %Y").parse(dt);
-      };
+      mychart.parse_date = d3.time.format("%b %d, %Y").parse;
 
       // add some metadata about the series
       mychart.series = [
@@ -44,11 +42,11 @@
               "name" : "AAPL",
               "css"  : "aapl"
           }
-      ]
+      ];
 
       // fetch data and draw the chart
       var url = "aapl.csv";
       d3.csv(url, function(data) {
-          mychart.data = data;
-          mychart.draw_chart();
+          mychart.setSeriesData([data]);
+          mychart.render();
       });
diff --git a/index.html b/index.html
index af94323..3014d22 100644
--- a/index.html
+++ b/index.html
@@ -27,19 +27,17 @@
         var mychart = new d3_tsline("#chart");
         
         // override format_data function, taking json payload and creating
-        // 2-arrays as data points in a series.  Return an array of series
+        // 2-arrays as data points in a series.  Return an array of one series
         mychart.format_data = function(data) {
             var series = [];
-            data.forEach(function(json) {
+            data[0].forEach(function(json) {
                 series.push([json.date, json.val]);
             });
             return [ series ];
         };
         
         // override parse_date function to handle our data's date format
-        mychart.parse_date = function(dt) {
-            d3.time.format("%b %d, %Y").parse(dt);
-        };
+        mychart.parse_date = d3.time.format("%b %d, %Y").parse;
         
         // add some metadata about the series
         mychart.series = [
@@ -47,13 +45,13 @@
                 "name" : "AAPL",
                 "css"  : "aapl"
             }
-        ]
+        ];
         
         // fetch data and draw the chart
         var url = "aapl.csv";
         d3.csv(url, function(data) {
-            mychart.data = data;
-            mychart.draw_chart();
+            mychart.setSeriesData([data]);
+            mychart.render();
         });
       //]]>
     </script>
diff --git a/js/d3.tsline.js b/js/d3.tsline.js
index d824252..6a9db0a 100644
--- a/js/d3.tsline.js
+++ b/js/d3.tsline.js
@@ -262,8 +262,8 @@ function d3_tsline(id) {
 
         // set up scale and axis functions
         var diff = self.get_diff(w, values);
-        var x = d3.scale.linear()
-            .range([1, w + diff]) // overlap to make smooth scroll effect
+        var x = d3.time.scale()
+            .range([1, w + diff])
             .domain(self.domain.view.x);
         var y = d3.scale.linear()
             .range([h, 0])
@@ -338,9 +338,9 @@ function d3_tsline(id) {
 
         // set up scale and axis functions
         var diff = w / values[0].length;
-        var x = d3.scale.linear()
-            .range([1, w + diff]) // overlap to make smooth scroll effect
-            .domain(self.domain.summary.x);
+        var x = d3.time.scale()
+            .range([1, w + diff])
+            .domain(self.domain.view.x);
         var y = d3.scale.linear()
             .range([h, 0])
             .domain(self.domain.summary.y).nice();