diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective2.java b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective2.java
index 97207208b2..cfb25a3d73 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective2.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective2.java
@@ -105,7 +105,7 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.exercise_15g, false))
                 .hint(new Hint(R.string.exercise_hint1))
         );
-        tasks.add(new ExamTask(R.string.pumpdisconnect_label, R.string.pumpdisconnect_label,"pumpdisconnect")
+        tasks.add(new ExamTask(R.string.pumpdisconnect_label, R.string.pumpdisconnect_whattodo,"pumpdisconnect")
                 .option(new Option(R.string.pumpdisconnect_unnecessary, false))
                 .option(new Option(R.string.pumpdisconnect_missinginsulin, true))
                 .option(new Option(R.string.pumpdisconnect_notstop, false))
@@ -120,24 +120,25 @@ public class Objective2 extends Objective {
                 .hint(new Hint(R.string.insulin_hint1))
         );
         tasks.add(new ExamTask(R.string.sensitivity_label, R.string.sensitivity_which,"sensitivity")
-                .option(new Option(R.string.sensitivityweightedaverage, true))
-                .option(new Option(R.string.sensitivityoref1, false))
-                .option(new Option(R.string.sensitivityaaps, true))
-                .hint(new Hint(R.string.sensitivity_hint1))
-        );
-        tasks.add(new ExamTask(R.string.sensitivity_label, R.string.sensitivityuam_which,"sensitivityuam")
-                .option(new Option(R.string.sensitivityweightedaverage, false))
-                .option(new Option(R.string.sensitivityoref1, true))
-                .option(new Option(R.string.sensitivityaaps, false))
+                .option(new Option(R.string.sensitivity_adjust, true))
+                .option(new Option(R.string.sensitivity_edit, false))
+                .option(new Option(R.string.sensitivity_cannula, true))
+                .option(new Option(R.string.sensitivity_time, true))
                 .hint(new Hint(R.string.sensitivity_hint1))
         );
         tasks.add(new ExamTask(R.string.objectives_label, R.string.objectives_howtosave,"objectives")
-                .option(new Option(R.string.objectives_exportsettings, true))
-                .option(new Option(R.string.objectives_storeelsewhere, true))
-                .option(new Option(R.string.objectives_doexportonstart, false))
-                .option(new Option(R.string.objectives_doexportafterchange, true))
-                .option(new Option(R.string.objectives_doexportafterobjective, true))
-                .option(new Option(R.string.objectives_doexportafterfirtssettings, true))
+                .option(new Option(R.string.objectives_notesettings, false))
+                .option(new Option(R.string.objectives_afterobjective, true))
+                .option(new Option(R.string.objectives_afterchange, true))
+                .option(new Option(R.string.objectives_afterinitialsetup, true))
+                .hint(new Hint(R.string.objectives_hint1))
+                .hint(new Hint(R.string.objectives_hint2))
+        );
+        tasks.add(new ExamTask(R.string.objectives_label, R.string.objectives_howtosave,"objectives2")
+                .option(new Option(R.string.objectives_maintenance, true))
+                .option(new Option(R.string.objectives_internalstorage, true))
+                .option(new Option(R.string.objectives_cloud, true))
+                .option(new Option(R.string.objectives_easyrestore, false))
                 .hint(new Hint(R.string.objectives_hint1))
                 .hint(new Hint(R.string.objectives_hint2))
         );
diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml
index 3a307feb7f..9d97fb0686 100644
--- a/app/src/main/res/values/exam.xml
+++ b/app/src/main/res/values/exam.xml
@@ -25,14 +25,16 @@
     <string name="pumpdisconnect_notstop">It will not stop insulin delivery if the pump remains connected.</string>
     <string name="pumpdisconnect_openloop">It will send AndroidAPS into open loop mode.</string>
     <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
-    <string name="objectives_label">Topic: AndroidAPS Settings</string>
-    <string name="objectives_howtosave">What are best practices to backup your settings?</string>
-    <string name="objectives_exportsettings">Locally export them from Maintenance menu.</string>
-    <string name="objectives_storeelsewhere">Store exported file to another place like email, Dropbox, Google drive…</string>
-    <string name="objectives_doexportonstart">Export them right after installation of AAPS.</string>
-    <string name="objectives_doexportafterchange">Export them after making setting changes.</string>
-    <string name="objectives_doexportafterobjective">Export them after completing an objective.</string>
-    <string name="objectives_doexportafterfirtssettings">Export them when you finish initial settings.</string>
+    <string name="objectives_label">Topic 13: AndroidAPS Settings</string>
+    <string name="objectives_howtosave">What are the best practices for backing up your settings?</string>
+    <string name="objectives_notesettings">You do not need to export your settings provided that you make a note of them.</string>
+    <string name="objectives_afterobjective">Export your settings after you finish completing an objective.</string>
+    <string name="objectives_afterchange">Export your settings after changing any of your settings.</string>
+    <string name="objectives_afterinitialsetup">Export your settings after you finish your initial set-up and have set your Preferences.</string>
+    <string name="objectives_maintenance">Export your settings locally using the maintenance menu.</string>
+    <string name="objectives_internalstorage">Your settings file is found in the folder Internal Storage\AndroidAPS\preferences on your phone.</string>
+    <string name="objectives_cloud">Copy your preferences file to a safe location outside of your phone (e.g. by using a cloud drive, connecting a cable to a computer, email, etc.)</string>
+    <string name="objectives_easyrestore">If your phone is damaged or lost, there are easy ways to remotely recover your settings without a backup.</string>
     <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/ExportImportSettings.html</string>
     <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me</string>
     <string name="noisycgm_label">Topic: Noisy CGM Readings</string>
@@ -114,10 +116,13 @@
     <string name="insulin_humalog">Humalog®</string>
     <string name="insulin_actrapid">Actrapid®/Humalin R®/"regular" human insulin.</string>
     <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
-    <string name="sensitivity_label">Topic: Sensitivity Plugins</string>
-    <string name="sensitivity_which">Which sensitivity algorithm has a configurable time range?</string>
+    <string name="sensitivity_label">Topic 12: Sensitivity Plugins</string>
+    <string name="sensitivity_which">Check all correct answers.</string>
+    <string name="sensitivity_adjust">Sensitivity plugins allow AndroidAPS to adjust for temporary or short-lived changes in insulin sensitivity (for example hormonal changes or issues with absorption at the infusion site).</string>
+    <string name="sensitivity_edit">Sensitivity plugins provide the user with suggested changes to basal rates, I:C ratios and ISF that can be used to edit profile.</string>
+    <string name="sensitivity_cannula">Logging a cannula change will reset Autosens ratio back to 100%.</string>
+    <string name="sensitivity_time">Some of the plugin options have configurable time ranges that can be set by the user.</string>
     <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
-    <string name="sensitivityuam_which">Which sensitivity plugin must be used for the UAM feature?</string>
     <string name="wrongcarbs_label">Topic 16: Carb Entry Errors</string>
     <string name="wrongcarbs_whattodo">What should you do if you’ve made an incorrect carb entry?</string>
     <string name="wrongcarbs_treatmentstab">Delete the incorrect entry in Treatments and enter the correct new carb value.</string>