diff --git a/apps/heatsuite/ChangeLog b/apps/heatsuite/ChangeLog
index 4a79b3eac..5851db1ce 100644
--- a/apps/heatsuite/ChangeLog
+++ b/apps/heatsuite/ChangeLog
@@ -3,4 +3,5 @@
 0.06: Modified BLE Broadcasting; Includes Optical HR and Wrist Temperature
 0.07: Fixing storage overloaded issue
 0.08: Added scrolling to Surveys. CORESensor app added.
-0.09: Added High Temporal Accelerometry logging (x,y,z per second)
\ No newline at end of file
+0.09: Added High Temporal Accelerometry logging (x,y,z per second)
+0.10: Fixes to settings.js to account for optimizations in studyTasks.json
\ No newline at end of file
diff --git a/apps/heatsuite/heatsuite.settings.js b/apps/heatsuite/heatsuite.settings.js
index 86aecb318..3d0875664 100644
--- a/apps/heatsuite/heatsuite.settings.js
+++ b/apps/heatsuite/heatsuite.settings.js
@@ -104,9 +104,9 @@
     function deviceSettings() {
         var menu = { '< Back': function () { E.showMenu(mainMenuSettings()); } };
         menu[''] = { 'title': 'Devices' };
-        Object.keys(settings.StudyTasks).forEach(key => {
-            var details = settings.StudyTasks[key];
-            if (details.btPair === undefined || !details.btPair) return;
+        settings.StudyTasks.forEach(task => {
+            if (task.btPair === undefined || !task.btPair) return;
+            let key = task.id; // Adjust based on how you identify tasks
             let id = "bt_" + key + "_id";
             if (settings[id] !== undefined) {
                 menu["Clear " + key] = function () {
@@ -119,7 +119,7 @@
                     });
                 };
             } else {
-                menu["Pair " + key] = () => createMenuFromScan(key, settings.StudyTasks[key].btInfo.service);
+                menu["Pair " + key] = () => createMenuFromScan(key, task.btInfo.service);
             }
         });
         return menu;
@@ -147,7 +147,7 @@
             'CORESensor':'CORE Sensor'
         }
         for (let key in recorderOptions) {
-            let name = recorderOptions['key'];
+            let name = recorderOptions[key];
             menu[name] = {
                 value: settings.record.includes(key),
                 onchange: v => {updateRecorder(key,v);}
diff --git a/apps/heatsuite/metadata.json b/apps/heatsuite/metadata.json
index 96d860131..013a1377f 100644
--- a/apps/heatsuite/metadata.json
+++ b/apps/heatsuite/metadata.json
@@ -1,7 +1,7 @@
 { "id": "heatsuite",
   "name": "HeatSuite",
   "shortName":"HeatSuite",
-  "version":"0.09",
+  "version":"0.10",
   "description": "The smartwatch software to integrate with HeatSuite",
   "icon": "icon.png",
   "type": "app",