diff --git a/public/js/calculator.js b/public/js/calculator.js
index 207611c9e6..9ae06e890a 100644
--- a/public/js/calculator.js
+++ b/public/js/calculator.js
@@ -28,7 +28,7 @@ $(document).ready(function () {
     $('#chosen').text('Coming from ' + city.replace(/-/g, ' ').replace(/\w\S*/g, function (txt) {
         return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();
       }) + ', and making $' + lastYearsIncome.toString().replace(/0000$/, '0,000') + ', your true costs will be:');
-    var categoryNames = ['Lost Wages', 'Financing Cost', 'Housing Cost', 'Tuition / Wage Garnishing'];
+    var categoryNames = ['Lost Wages', 'Financing Cost', 'Housing Cost', 'Tuition / Est. Wage Garnishing'];
     bootcamps.forEach(function (camp) {
       var x0 = 0;
       if (camp.cities.indexOf(city) > -1) {
@@ -38,7 +38,7 @@ $(document).ready(function () {
       }
       camp.mapping = [{
         name: camp.name,
-        label: 'Tuition / Wage Garnishing',
+        label: 'Tuition / Est. Wage Garnishing',
         value: +camp.cost,
         x0: x0,
         x1: x0 += +camp.cost
diff --git a/public/json/bootcamps.json b/public/json/bootcamps.json
index 41b906c20b..19b016607c 100644
--- a/public/json/bootcamps.json
+++ b/public/json/bootcamps.json
@@ -221,7 +221,28 @@
   "cities": [
     "portland"
   ]
-}, {
+},
+  {
+    "name": "Viking Code School",
+    "cost": "18000",
+    "housing": "0",
+    "finance": false,
+    "weeks": "16",
+    "cities": [
+      "online"
+    ]
+  },
+  {
+    "name": "App Academy",
+    "cost": "18000",
+    "housing": "500",
+    "finance": false,
+    "weeks": "12",
+    "cities": [
+      "san-francisco"
+    ]
+  },
+  {
   "name": "Turing School",
   "cost": "17500",
   "housing": "400",
@@ -230,13 +251,4 @@
   "cities": [
     "denver"
   ]
-}, {
-  "name": "Free Code Camp",
-  "cost": "0",
-  "housing": "0",
-  "finance": false,
-  "weeks": "0",
-  "cities": [
-    "online"
-  ]
 }]
diff --git a/server/views/resources/calculator.jade b/server/views/resources/calculator.jade
index 60905c7014..df8642eac8 100644
--- a/server/views/resources/calculator.jade
+++ b/server/views/resources/calculator.jade
@@ -101,7 +101,6 @@ block content
                         li.large-li The most substantial cost for most people is lost wages. A 40-hour-per-week job at the US Federal minimum wage would pay at least $15,000 per year. You can read more about economic cost
                             a(href='https://en.wikipedia.org/wiki/Economic_cost' target='_blank')  here
                             | .
-                        li.large-li Free Code Camp. We don't charge tuition or garnish wages. We're fully online so you don't have to move. We're self-paced so you don't have to quit your job. Thus, your true cost of attending Free Code Camp will be $0.
                     .spacer
                     .row
                         .col-xs-12.col-sm-6