diff --git a/package-lock.json b/package-lock.json
index b0e5ecc..cce0b47 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4289,7 +4289,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4310,12 +4311,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4330,17 +4333,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4457,7 +4463,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4469,6 +4476,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4483,6 +4491,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -4490,12 +4499,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -4514,6 +4525,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -4594,7 +4606,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -4606,6 +4619,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4691,7 +4705,8 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -4727,6 +4742,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -4746,6 +4762,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -4789,12 +4806,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
diff --git a/src/js/main.js b/src/js/main.js
index 6bd1ae9..9a702ca 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -83,7 +83,7 @@ import Main from '../App.vue';
 Vue.component('solar-scorecard-stairstep', {
   mounted: function() {
     let xhr = new XMLHttpRequest();
-    xhr.open('GET', 'https://opencity.fcgov.com/resource/ykei-s9zt.json');
+    xhr.open('GET', 'https://opendata.fcgov.com/resource/3ku5-x4k9.json?$order=meta_row_index&$limit=100000');
     // This is so Socrata and the City knows who we are and our app
     //     it can often prevent API throttling
     xhr.setRequestHeader('X-App-Token', 'uGISPdpNnBfwN4kmj9goaZBNM');
@@ -114,9 +114,9 @@ Vue.component('solar-scorecard-ratios', {
     PieChart({
       selector: '#pie-chart',
       data: {
-        Electric: 50,
-        'Ground Travel': 26,
-        'Natural Gas': 19,
+        Electric: 51,
+        'Ground Travel': 24,
+        'Natural Gas': 21,
         'Solid Waste': 4,
         'Water Related': 0.3,
       },
diff --git a/src/templates/why-solar.html b/src/templates/why-solar.html
index 8034383..f2daa30 100644
--- a/src/templates/why-solar.html
+++ b/src/templates/why-solar.html
@@ -12,8 +12,8 @@ <h2>Carbon Production Ratios in Fort Collins</h2>
     <solar-scorecard-ratios></solar-scorecard-ratios>
 
     <p>The above chart describes the carbon-dioxide-equivilent emissions related to categories of use in Fort Collins,
-      as described in the <a href="https://www.fcgov.com/climateaction/pdf/2015-community-carbon-inventory.pdf?1494967837">
-        2015 City of Fort Collins Carbon Inventory</a>. We are most interested in tackling electricity, which makes up
+      as described in the <a href="https://ftcollinscap.clearpointstrategy.com/">
+        Current (as of 2017) City of Fort Collins Climate Dashboard</a>. We are most interested in tackling electricity, which makes up
       50% of the carbon emission in the City of Fort Collins.</p>
 
     <p>Emissions from electricity use are caused by fossil fuel combustion. Most of the electricity for Fort Collins is