From 0f5bfd1b08b484032ab1be9f271cda0d31cecaab Mon Sep 17 00:00:00 2001
From: Matthew Gray <mattnc30@hotmail.com>
Date: Wed, 28 Oct 2020 11:37:38 +0000
Subject: [PATCH 01/26] 1st few changes

---
 .idea/codeStyles/Project.xml                  | 15 +++----------
 .../objectives/objectives/Objective2.java     |  2 +-
 app/src/main/res/values/exam.xml              | 22 +++++++++----------
 3 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3542887fac..17dd11d581 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -4,18 +4,9 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
+          <package name="java.util" withSubpackages="false" static="false" />
+          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
+          <package name="io.ktor" withSubpackages="true" static="false" />
         </value>
       </option>
       <option name="ALIGN_IN_COLUMNS_CASE_BRANCH" value="true" />
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 62eb212ee3..f1192ad4f5 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
@@ -20,7 +20,7 @@ public class Objective2 extends Objective {
     @Override
     protected void setupTasks(List<Task> tasks) {
         tasks.add(new ExamTask(R.string.dia_label_exam, R.string.dia_whatmeansdia,"dia")
-                .option(new Option(R.string.dia_minimumis3h, false))
+                .option(new Option(R.string.dia_profile, true))
                 .option(new Option(R.string.dia_minimumis5h, true))
                 .option(new Option(R.string.dia_meaningisequaltodiapump, false))
                 .option(new Option(R.string.dia_valuemustbedetermined, true))
diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml
index 49dc294fa1..2ab9d987cb 100644
--- a/app/src/main/res/values/exam.xml
+++ b/app/src/main/res/values/exam.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">What is true about DIA?</string>
-    <string name="dia_label_exam">Topic: Duration of Insulin Action</string>
-    <string name="dia_minimumis3h">The minimum value is 3 hours.</string>
-    <string name="dia_minimumis5h">The minimum value is 5 hours.</string>
+    <string name="dia_label_exam">Topic 3: Duration of Insulin Action (DIA)</string>
+    <string name="dia_profile">You should set the value for DIA in your profile.</string>
+    <string name="dia_minimumis5h">The minimum allowed value is 5 hours.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
-    <string name="dia_meaningisequaltodiapump">The meaning is equal to the DIA parameter used in your pump.</string>
-    <string name="dia_valuemustbedetermined">You have to determine your individual value (but not less than 5 hours).</string>
-    <string name="hypott_label">Topic: Hypo Temp-Target</string>
-    <string name="hypott_whenhypott">What is primary reason to set a hypo TT?</string>
+    <string name="dia_meaningisequaltodiapump">If you are satisfied that the value for DIA that you used in your pump prior to AndroidAPS worked well, there is no need to change this when you start looping..</string>
+    <string name="dia_valuemustbedetermined">You should determine for yourself the appropriate value for DIA.</string>
+    <string name="hypott_label">Topic 6: Hypo Temp-Target</string>
+    <string name="hypott_whenhypott">What is primary reason to set a hypo  temp target?</string>
     <string name="hypott_goinglow">To prevent BG from going low if there is already zero temp running.</string>
-    <string name="hypott_preventoversmb">To prevent AAPS from dosing too much insulin after a rise caused by fast-acting carbs used to treat a low.</string>
+    <string name="hypott_preventoversmb">To prevent AndroidAPS from overcorrecting for a blood glucose rise caused by the fast acting carbs used to treat a hypo.</string>
     <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html</string>
     <string name="offlineprofile_whatprofile">Which profile can be used and configured offline?</string>
     <string name="offlineprofile_label">Topic: Offline Profile</string>
@@ -162,8 +162,8 @@
     <string name="basalhelp_diabetesteam">Your diabetes team</string>
     <string name="basalhelp_google">Google</string>
     <string name="basalhelp_facebook">Facebook</string>
-    <string name="other_medication_label">Other Medication</string>
-    <string name="other_medication_text">AAPS reduces BR to raise blood sugar. Drugs from the group of SGLT2 inhibitors (gliflozins) can prevent the expected increase in BG and thus may produce a dangerous insulin deficiency (DKA).
-\nCommon brand names are: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nI hereby promise that I will not take such drugs when using AAPS or will deactivate the loop before using these drugs.</string>
+    <string name="other_medication_label">Topic 21: Other Medication. Please read the statement below and then check the box to accept the declaration.</string>
+    <string name="other_medication_text">AndroidAPS reduces basal rates or suspends insulin delivery to raise blood sugar. Drugs in the class SGLT2 inhibitors (gliflozins) can prevent increases in blood glucose and therefore can produce a dangerous insulin deficiency leading to DKA.
+\nCommon brand names are: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nI hereby promise that I will not take such drugs when using AndroidAPS or will deactivate the loop before using such drugs.</string>
 
 </resources>

From 584869094f23bf931ea7c8d87c7dc3b4cf737788 Mon Sep 17 00:00:00 2001
From: Matthew Gray <mattnc30@hotmail.com>
Date: Wed, 28 Oct 2020 14:05:35 +0000
Subject: [PATCH 02/26] 2nd few changes so I can build this as a test.

---
 .../objectives/objectives/Objective2.java     |  75 +++++++------
 app/src/main/res/values/exam.xml              | 103 ++++++++++++------
 2 files changed, 108 insertions(+), 70 deletions(-)

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 f1192ad4f5..b070c7d4d4 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
@@ -28,7 +28,9 @@ public class Objective2 extends Objective {
         );
         tasks.add(new ExamTask(R.string.hypott_label, R.string.hypott_whenhypott,"hypott")
                 .option(new Option(R.string.hypott_goinglow, false))
+                .option(new Option(R.string.hypott_exercise, false))
                 .option(new Option(R.string.hypott_preventoversmb, true))
+                .option(new Option(R.string.hypott_0basal, false))
                 .hint(new Hint(R.string.hypott_hint1))
         );
         tasks.add(new ExamTask(R.string.offlineprofile_label, R.string.offlineprofile_whatprofile,"offlineprofile")
@@ -62,14 +64,18 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.noisycgm_checksmoothing, true))
                 .hint(new Hint(R.string.noisycgm_hint1))
         );
+        tasks.add(new ExamTask(R.string.exerciseprofile_label, R.string.exercise_whattodo,"exercise")
+                .option(new Option(R.string.exerciseprofile_switchprofileabove100, false))
+                .option(new Option(R.string.exerciseprofile_switchprofilebelow100, true))
+                .option(new Option(R.string.exerciseprofile_suspendloop, false))
+                .option(new Option(R.string.exerciseprofile_suspendloop, false))
+                .hint(new Hint(R.string.exerciseprofile_hint1))
+        );
         tasks.add(new ExamTask(R.string.exercise_label, R.string.exercise_whattodo,"exercise")
-                .option(new Option(R.string.nothing, false))
-                .option(new Option(R.string.exercise_setactivitytt, true))
-                .option(new Option(R.string.exercise_switchprofilebelow100, true))
-                .option(new Option(R.string.exercise_switchprofileabove100, false))
-                .option(new Option(R.string.exercise_stoploop, false))
-                .option(new Option(R.string.exercise_doitbeforestart, true))
-                .option(new Option(R.string.exercise_afterstart, true))
+                .option(new Option(R.string.exercise_settt, false))
+                .option(new Option(R.string.exercise_setfinished, true))
+                .option(new Option(R.string.exercise_setunchanged, false))
+                .option(new Option(R.string.exercise_15g, false))
                 .hint(new Hint(R.string.exercise_hint1))
         );
        tasks.add(new ExamTask(R.string.suspendloop_label, R.string.suspendloop_doigetinsulin,"suspendloop")
@@ -77,9 +83,10 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.suspendloop_no, false))
         );
        tasks.add(new ExamTask(R.string.basaltest_label, R.string.basaltest_when,"basaltest")
-                .option(new Option(R.string.basaltest_beforeloop, true))
-                .option(new Option(R.string.basaltest_havingregularhypo, true))
-                .option(new Option(R.string.basaltest_havingregularhyper, true))
+                .option(new Option(R.string.basaltest_fixed, false))
+                .option(new Option(R.string.basaltest_havingregularhighlow, true))
+                .option(new Option(R.string.basaltest_weekly, false))
+               .option(new Option(R.string.basaltest_beforeloop, true))
                  .hint(new Hint(R.string.basaltest_hint1))
         );
        tasks.add(new ExamTask(R.string.basalhelp_label, R.string.basalhelp_where,"basalhelp")
@@ -89,21 +96,20 @@ public class Objective2 extends Objective {
                  .hint(new Hint(R.string.basalhelp_hint1))
         );
        tasks.add(new ExamTask(R.string.prerequisites_label, R.string.prerequisites_what, "prerequisites")
-                .option(new Option(R.string.prerequisites_determinedcorrectprofile, true))
-                .option(new Option(R.string.prerequisites_computer, true))
-                .option(new Option(R.string.prerequisites_phone, true))
-                .option(new Option(R.string.prerequisites_car, false))
-                .option(new Option(R.string.prerequisites_nightscout, true))
-                .option(new Option(R.string.prerequisites_tidepoolaccount, false))
-                .option(new Option(R.string.prerequisites_googleaccount, false))
-                .option(new Option(R.string.prerequisites_githubaccount, false))
-                .option(new Option(R.string.prerequisites_beanandroiddeveloper, false))
-                .option(new Option(R.string.prerequisites_own670g, false))
-                .option(new Option(R.string.prerequisites_smartwatch, false))
-                .option(new Option(R.string.prerequisites_supportedcgm, true))
+               .option(new Option(R.string.prerequisites_nightscout, true))
+               .option(new Option(R.string.prerequisites_computer, true))
+               .option(new Option(R.string.prerequisites_pump, true))
+               .option(new Option(R.string.prerequisites_beanandroiddeveloper, false))
                 .hint(new Hint(R.string.prerequisites_hint1))
         );
-        tasks.add(new ExamTask(R.string.update_label, R.string.whatistrue,"update")
+        tasks.add(new ExamTask(R.string.prerequisites2_label, R.string.prerequisites2_what, "prerequisites")
+                .option(new Option(R.string.prerequisites2_profile, true))
+                .option(new Option(R.string.prerequisites2_device, true))
+                .option(new Option(R.string.prerequisites2_internet, false))
+                .option(new Option(R.string.prerequisites2_supportedcgm, true))
+                .hint(new Hint(R.string.prerequisites2_hint1))
+        );
+                tasks.add(new ExamTask(R.string.update_label, R.string.whatistrue,"update")
                 .option(new Option(R.string.update_git, true))
                 .option(new Option(R.string.update_asap, true))
                 .option(new Option(R.string.update_keys, true))
@@ -161,20 +167,19 @@ public class Objective2 extends Objective {
                 .hint(new Hint(R.string.nsclient_hint1))
         );
         tasks.add(new ExamTask(R.string.isf_label_exam, R.string.whatistrue,"isf")
-                .option(new Option(R.string.isf_increasingvalue, true))
-                .option(new Option(R.string.isf_decreasingvalue, false))
-                .option(new Option(R.string.isf_noeffect, false))
+                .option(new Option(R.string.isf_decreasingvalue, true))
                 .option(new Option(R.string.isf_preferences, false))
+                .option(new Option(R.string.isf_increasingvalue, false))
+                .option(new Option(R.string.isf_noeffect, false))
                 .option(new Option(R.string.isf_profile, false))
                 .hint(new Hint(R.string.isf_hint1))
                 .hint(new Hint(R.string.isf_hint2))
         );
         tasks.add(new ExamTask(R.string.ic_label_exam, R.string.whatistrue,"ic")
-                .option(new Option(R.string.ic_increasingvalue, true))
-                .option(new Option(R.string.ic_decreasingvalue, false))
-                .option(new Option(R.string.ic_noeffect, false))
-                .option(new Option(R.string.ic_different, false))
-                .option(new Option(R.string.ic_meaning, false))
+                .option(new Option(R.string.ic_increasingvalue, false))
+                .option(new Option(R.string.ic_decreasingvalue, true))
+                .option(new Option(R.string.ic_multiple, true))
+                .option(new Option(R.string.ic_isf, false))
                 .hint(new Hint(R.string.ic_hint1))
         );
         tasks.add(new ExamTask(R.string.profileswitch_label, R.string.profileswitch_pctwillchange,"profileswitch")
@@ -192,10 +197,10 @@ public class Objective2 extends Objective {
         );
 
         tasks.add(new ExamTask(R.string.profileswitch_label, R.string.profileswitchtime_iwant,"profileswitchtime")
-                .option(new Option(R.string.profileswitchtime_1, false))
-                .option(new Option(R.string.profileswitchtime__1, true))
-                .option(new Option(R.string.profileswitchtime_60, false))
-                .option(new Option(R.string.profileswitchtime__60, false))
+                .option(new Option(R.string.profileswitchtime_2, false))
+                .option(new Option(R.string.profileswitchtime__2, true))
+                .option(new Option(R.string.profileswitchtime_tt, false))
+                .option(new Option(R.string.profileswitchtime_100, false))
                 .hint(new Hint(R.string.profileswitchtime_hint1))
         );
 
diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml
index 2ab9d987cb..54b90c92ad 100644
--- a/app/src/main/res/values/exam.xml
+++ b/app/src/main/res/values/exam.xml
@@ -11,6 +11,8 @@
     <string name="hypott_whenhypott">What is primary reason to set a hypo  temp target?</string>
     <string name="hypott_goinglow">To prevent BG from going low if there is already zero temp running.</string>
     <string name="hypott_preventoversmb">To prevent AndroidAPS from overcorrecting for a blood glucose rise caused by the fast acting carbs used to treat a hypo.</string>
+    <string name="hypott_exercise">To correct for a hypo induced as a result of exercise.</string>
+    <string name="hypott_0basal">To prevent blood glucose from going low of there is already a 0% temporary basal rate running.</string>
     <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html</string>
     <string name="offlineprofile_whatprofile">Which profile can be used and configured offline?</string>
     <string name="offlineprofile_label">Topic: Offline Profile</string>
@@ -40,40 +42,72 @@
     <string name="noisycgm_turnoffphone">Turn off the phone.</string>
     <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
     <string name="noisycgm_checksmoothing">Verify that your CGM app smoothes BG data.</string>
-    <string name="exercise_label">Topic: Exercise</string>
-    <string name="exercise_whattodo">How can you help the system deal with exercise?</string>
-    <string name="exercise_setactivitytt">Using of temp-target feature.</string>
-    <string name="exercise_switchprofilebelow100">Do a profile switch below 100%.</string>
-    <string name="exercise_switchprofileabove100">Do a profile switch above 100%.</string>
-    <string name="exercise_stoploop">Stop the loop.</string>
-    <string name="exercise_doitbeforestart">Set an activity temp-target before starting exercise.</string>
-    <string name="exercise_afterstart">Setting an activity temp-target after starting exercise leads to worse results than if started before.</string>
+
+
+    <string name="exerciseprofile_label">Topic 8: Exercise and Profiles.</string>
+    <string name="exerciseprofile_whattodo">How can you use profiles to best help the system deal with aerobic exercise?</string>
+    <string name="exerciseprofile_switchprofilebelow100">Do a profile switch to more than 100%.</string>
+    <string name="exerciseprofile_switchprofileabove100">Do a profile switch to less than 100%. </string>
+    <string name="exercisprofilee_leaveat100">Leave the profile set to 100%.</string>
+    <string name="exerciseprofile_suspendloop">Suspend the loop.</string>
+    <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
+
+
+    <string name="exercise_label">Topic 9: Exercise and Temporary Targets.</string>
+    <string name="exercise_whattodo">How can you use temporary targets to best help the system deal with aerobic exercise?</string>
+    <string name="exercise_settt">Set an activity blood glucose target starting a suitable time before beginning exercise.</string>
+    <string name="exercise_setfinished">Set an activity blood glucose target after finishing exercise.</string>
+    <string name="exercise_setunchanged">Leave your blood glucose target unchanged.</string>
+    <string name="exercise_15g">Wait until blood glucose drops below your hypo temp target and then eat 15 g of fast acting carbohydrates.</string>
     <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     <string name="suspendloop_label">Topic: Disabled/Suspended loop</string>
     <string name="suspendloop_doigetinsulin">Do I receive insulin when the loop is disabled/suspended?</string>
     <string name="suspendloop_yes">Yes, basal insulin continues to be delivered.</string>
     <string name="suspendloop_no">No, delivery of insulin is stopped.</string>
-    <string name="basaltest_label">Topic: Basal, ISF, and IC Testing</string>
-    <string name="basaltest_when">When should I validate basals, ISF, and IC values?</string>
-    <string name="basaltest_beforeloop">Before I start looping.</string>
-    <string name="basaltest_havingregularhypo">When experiencing low BG frequently.</string>
-    <string name="basaltest_havingregularhyper">When experiencing high BG frequently.</string>
+    <string name="basaltest_label">Topic 2: Basal, ISF, and IC Testing</string>
+    <string name="basaltest_when">When should these values be validated?</string>
+    <string name="basaltest_beforeloop">Before starting looping.</string>
+    <string name="basaltest_havingregularhighlow">When experiencing frequent high or low blood glucose.</string>
+    <string name="basaltest_weekly">At least once per week.</string>
+    <string name="basaltest_fixed">Once set and validated, these values should not change over time.</string>
     <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
     <string name="prerequisites_label">Topic: Prerequisites</string>
-    <string name="prerequisites_what">What do I need?</string>
+    <string name="prerequisites_what">What is essential to set up and use AndroidAPS?</string>
     <string name="prerequisites_determinedcorrectprofile">Validated profile information (Basal, IC, ISF, DIA).</string>
-    <string name="prerequisites_computer">A computer to create an APK.</string>
+    <string name="prerequisites_computer">A computer with Android Studio installed and configured.</string>
     <string name="prerequisites_phone">A supported phone.</string>
-    <string name="prerequisites_car">A Car.</string>
-    <string name="prerequisites_nightscout">Nightscout to pass the objectives.</string>
+    <string name="prerequisites_pump">A compatible insulin pump if you are planning to run a closed loop.</string>
+    <string name="prerequisites_nightscout">Nightscout, to keep a log of all data and review settings.</string>
     <string name="prerequisites_tidepoolaccount">A Tidepool account.</string>
     <string name="prerequisites_googleaccount">A Google account.</string>
     <string name="prerequisites_githubaccount">A Github account.</string>
-    <string name="prerequisites_beanandroiddeveloper">Android development experience.</string>
+    <string name="prerequisites_beanandroiddeveloper">Experience in programming or editing code.</string>
     <string name="prerequisites_own670g">A MiniMed 670G pump.</string>
     <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
     <string name="prerequisites_smartwatch">A Smartwatch.</string>
     <string name="prerequisites_supportedcgm">A Supported CGM.</string>
+    <string name="prerequisites2_label">Topic: More Prerequisites</string>
+    <string name="prerequisites2_what">What is essential to set up and use AndroidAPS?</string>
+    <string name="prerequisites2_profile">Validated information to set up a profile (ISF, I:C ratio, basal rates, DIA etc.).</string>
+    <string name="prerequisites2_device">A compatible Android device (e.g. mobile/cell phone, full Android watch, or tablet).</string>
+    <string name="prerequisites2_internet">AndroidAPS requires an internet connection in order to run in closed loop.</string>
+    <string name="prerequisites2_supportedcgm">A Supported CGM and appropriate app to receive blood glucose values on the phone/device.</string>
+    <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
     <string name="update_label">Topic: Updating AndroidAPS</string>
     <string name="whatistrue">What is true?</string>
     <string name="update_git">You need to have Git installed.</string>
@@ -122,22 +156,21 @@
     <string name="nsclient_looponiphone">Loop app on iPhone.</string>
     <string name="nsclient_spikeiphone">Spike app on iPhone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
-    <string name="isf_label_exam">Topic: Insulin Sensitivity Factor</string>
-    <string name="isf_increasingvalue">Higher ISF values lead to less insulin delivery when AAPS corrects for high BG.</string>
-    <string name="isf_decreasingvalue">Lower ISF values lead to less insulin delivery when AAPS corrects for high BG.</string>
-    <string name="isf_noeffect">Changing ISF values has no effect on the amount of insulin delivered when AAPS corrects for high BG.</string>
-    <string name="isf_preferences">You have to enter ISF in Preferences.</string>
+    <string name="isf_label_exam">Topic 4: Insulin Sensitivity Factor (ISF)</string>
+    <string name="isf_increasingvalue">Raising ISF values will lead to more insulin delivery to cover a specific amount of carbs.</string>
+    <string name="isf_decreasingvalue">Reducing ISF values lead to more insulin delivery to correct for an above target blood glucose.</string>
+    <string name="isf_noeffect">Raising or lowering ISF values will not affect the insulin delivery when AndroidAPS corrects for a below-target blood glucose.</string>
+    <string name="isf_preferences">ISF should be entered in your AndroidAPS Preferences.</string>
     <string name="isf_profile">Changing the ISF value in your profile is enough to apply the change.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
-    <string name="ic_label_exam">Topic: The IC Ratio</string>
-    <string name="ic_increasingvalue">Higher IC ratios lead to less insulin delivered for a given amount of carbs.</string>
-    <string name="ic_decreasingvalue">Lower IC ratios lead to less insulin delivered for a given amount of carbs.</string>
-    <string name="ic_noeffect">If you have 0 COB, changing the IC ratio will lead to a different amount of insulin to correct a given BG value.</string>
-    <string name="ic_different">IC will be different if you count bread unit as 10g or 12g.</string>
-    <string name="ic_meaning">IC meaning is: How many bread units are covered by 1U of insulin.</string>
+    <string name="ic_label_exam">Topic 5: The Insulin to Carbohydrate (I:C) Ratio</string>
+    <string name="ic_increasingvalue">When COB is zero, raising I:C ratio will lead to more insulin being delivered to correct an above target blood glucose value.</string>
+    <string name="ic_decreasingvalue">Lowering the numerical value of the I:C ratio (so that the value of I:C is smaller) will lead to more insulin being delivered for a specific amount of carbs. </string>
+    <string name="ic_multiple">You can use more than one value for I:C ratio in your profile.</string>
+    <string name="ic_isf">If you change your ISF in your profile you should always change your I:C ratio too.</string>
     <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
-    <string name="profileswitch_label">Topic: Profile Switching</string>
+    <string name="profileswitch_label">Topic 7: Profile Switching</string>
     <string name="profileswitch_pctwillchange"> When specifying 90% in profile switch…</string>
     <string name="profileswitch_basalhigher">Basals will be 10% higher.</string>
     <string name="profileswitch_basallower">Basals will be 10% lower.</string>
@@ -150,12 +183,12 @@
     <string name="profileswitch_targetlower">Target will be 10% lower.</string>
     <string name="profileswitch_targetbottom">Only bottom target will be 10% lower.</string>
     <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
-    <string name="profileswitchtime_iwant">If you wake up 1h earlier than usual, how should you notify AAPS of the change in your schedule?</string>
-    <string name="profileswitchtime_1">Initiate a profile switch with a timeshift of 1</string>
-    <string name="profileswitchtime__1">Initiate a profile switch with a timeshift of -1</string>
+    <string name="profileswitchtime_iwant">If you get up 2 hours earlier than usual, how should you notify AndroidAPS of the change in your schedule?</string>
+    <string name="profileswitchtime_2">Initiate a profile switch with a timeshift of 1</string>
+    <string name="profileswitchtime__2">Initiate a profile switch with a timeshift of -1</string>
     <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
-    <string name="profileswitchtime_60">Initiate a profile switch with a timeshift of 60</string>
-    <string name="profileswitchtime__60">Initiate a profile switch with a timeshift of -60</string>
+    <string name="profileswitchtime_tt">Set an eating soon temporary target.</string>
+    <string name="profileswitchtime_100">Do a profile switch to more than 100%. </string>
     <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
     <string name="basalhelp_label">Topic: Help with basal rates</string>
     <string name="basalhelp_where">Where to go for help with basalrate etc.</string>

From b2b59968cab9ba36385ba98334769cfc179e0b21 Mon Sep 17 00:00:00 2001
From: Matthew Gray <mattnc30@hotmail.com>
Date: Thu, 29 Oct 2020 13:49:52 +0000
Subject: [PATCH 03/26] Can't remember if I did a commit when I stopped work
 yesterday. Doing one before I start.

---
 .../objectives/objectives/Objective2.java     | 17 ++++---
 app/src/main/res/values/exam.xml              | 46 ++++++++++---------
 2 files changed, 33 insertions(+), 30 deletions(-)

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 b070c7d4d4..b7d92b64fb 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
@@ -39,10 +39,11 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.offlineprofile_nsprofile, true))
                 .hint(new Hint(R.string.offlineprofile_hint1))
         );
-        tasks.add(new ExamTask(R.string.pumpdisconnect_label, R.string.pumpdisconnect_label,"pumpdisconnect")
-                .option(new Option(R.string.pumpdisconnect_letknow, true))
-                .option(new Option(R.string.pumpdisconnect_suspend, false))
-                .option(new Option(R.string.pumpdisconnect_dontchnage, false))
+        tasks.add(new ExamTask(R.string.pumpdisconnect_label,"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))
+                .option(new Option(R.string.pumpdisconnect_openloop, false))
                 .hint(new Hint(R.string.pumpdisconnect_hint1))
         );
         tasks.add(new ExamTask(R.string.objectives_label, R.string.objectives_howtosave,"objectives")
@@ -111,27 +112,25 @@ public class Objective2 extends Objective {
         );
                 tasks.add(new ExamTask(R.string.update_label, R.string.whatistrue,"update")
                 .option(new Option(R.string.update_git, true))
-                .option(new Option(R.string.update_asap, true))
-                .option(new Option(R.string.update_keys, true))
-                .option(new Option(R.string.update_neverupdate, false))
                 .option(new Option(R.string.update_askfriend, false))
+                .option(new Option(R.string.update_keys, true))
+                .option(new Option(R.string.update_asap, false))
                 .hint(new Hint(R.string.update_hint1))
         );
         tasks.add(new ExamTask(R.string.troubleshooting_label, R.string.troubleshooting_wheretoask,"troubleshooting")
                 .option(new Option(R.string.troubleshooting_fb, true))
                 .option(new Option(R.string.troubleshooting_wiki, true))
                 .option(new Option(R.string.troubleshooting_gitter, true))
-                .option(new Option(R.string.troubleshooting_googlesupport, false))
                 .option(new Option(R.string.troubleshooting_yourendo, false))
                 .hint(new Hint(R.string.troubleshooting_hint1))
                 .hint(new Hint(R.string.troubleshooting_hint2))
                 .hint(new Hint(R.string.troubleshooting_hint3))
         );
         tasks.add(new ExamTask(R.string.insulin_label, R.string.insulin_ultrarapid,"insulin")
-                .option(new Option(R.string.insulin_fiasp, true))
                 .option(new Option(R.string.insulin_novorapid, false))
                 .option(new Option(R.string.insulin_humalog, false))
                 .option(new Option(R.string.insulin_actrapid, false))
+                .option(new Option(R.string.insulin_fiasp, true))
                 .hint(new Hint(R.string.insulin_hint1))
         );
         tasks.add(new ExamTask(R.string.sensitivity_label, R.string.sensitivity_which,"sensitivity")
diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml
index 54b90c92ad..67b9d469da 100644
--- a/app/src/main/res/values/exam.xml
+++ b/app/src/main/res/values/exam.xml
@@ -18,11 +18,12 @@
     <string name="offlineprofile_label">Topic: Offline Profile</string>
     <string name="offlineprofile_nsprofile">NS Profile can be used, but not configured.</string>
     <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
-    <string name="pumpdisconnect_label">Topic: Disconnecting from the Pump</string>
+    <string name="pumpdisconnect_label">Topic 10: Reasons for applying "Disconnect pump" in AndroidAPS.</string>
     <string name="pumpdisconnect_whattodo">What should be done when disconnecting the pump?</string>
-    <string name="pumpdisconnect_letknow">Click ‘Disconnect pump’ so that AAPS knows that no insulin is being delivered.</string>
-    <string name="pumpdisconnect_suspend">Click ‘Suspend loop’ so that AAPS stops looping while the pump is disconnected.</string>
-    <string name="pumpdisconnect_dontchnage">Don’t change anything in AAPS, just disconnect the pump.</string>
+    <string name="pumpdisconnect_unnecessary">This is unnecessary as insulin will not be delivered if the pump is physically disconnected.</string>
+    <string name="pumpdisconnect_missinginsulin">It prevents AndroidAPS from accounting for insulin that was not delivered whilst the pump is physically disconnected. </string>
+    <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>
@@ -108,35 +109,38 @@
     <string name="prerequisites2_internet">AndroidAPS requires an internet connection in order to run in closed loop.</string>
     <string name="prerequisites2_supportedcgm">A Supported CGM and appropriate app to receive blood glucose values on the phone/device.</string>
     <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
-    <string name="update_label">Topic: Updating AndroidAPS</string>
-    <string name="whatistrue">What is true?</string>
-    <string name="update_git">You need to have Git installed.</string>
-    <string name="update_asap">Update as soon as new version is released and having enough time to do it.</string>
-    <string name="update_keys">You should use the same signing keys.</string>
+    <string name="update_label">Topic 14: Updating AndroidAPS</string>
+    <string name="whatistrue">Check all correct answers.</string>
+    <string name="update_git">You need to have Git installed and configured on your computer.</string>
+    <string name="update_asap">When updated versions of AndroidAPS are released, the earlier versions may be remotely limited after a specified time.</string>
+    <string name="update_keys">You should save and note the location of your keystore and use the same signing key for updates as for your previous installation.</string>
     <string name="update_neverupdate">Never update if the system is working well.</string>
-    <string name="update_askfriend">Ask your friend for the new APK.</string>
+    <string name="update_askfriend">If you have difficulty building the apk, you can install an apk that has been built by a friend.</string>
     <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
-    <string name="troubleshooting_label">Topic: Troubleshooting</string>
-    <string name="troubleshooting_wheretoask">Where to look for help?</string>
-    <string name="troubleshooting_fb">Join the AndroidAPS Facebook group.</string>
-    <string name="troubleshooting_wiki">Read the AndroidAPS documentation.</string>
-    <string name="troubleshooting_gitter">Visit AndroidAPS Gitter Room.</string>
-    <string name="troubleshooting_googlesupport">Visit AndroidAPS Google support</string>
-    <string name="troubleshooting_yourendo">Speak to your endocrinologist.</string>
+    <string name="troubleshooting_label">Topic 15: Troubleshooting</string>
+    <string name="troubleshooting_wheretoask">Where can you look for help with AndroidAPS?</string>
+    <string name="troubleshooting_fb">You can ask for advice in the AndroidAPS Users Facebook group.</string>
+    <string name="troubleshooting_wiki">You should read (and re-read) the AndroidAPS documentation.</string>
+    <string name="troubleshooting_gitter">You can ask for advice and log technical problems or issues in the AndroidAPS Gitter room.</string>
+    <string name="troubleshooting_yourendo">You should ask your diabetes clinic/endocrinologist.</string>
     <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting</string>
     <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
     <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
-    <string name="insulin_label">Topic: Insulin Plugins</string>
-    <string name="insulin_ultrarapid">Which brand of insulin can be used with the ‘Ultra-Rapid-Oref’ plugin?</string>
+    <string name="insulin_label">Topic 11: Insulin Plugins</string>
+    <string name="insulin_ultrarapid">Which insulin should you use with the Ultra-Rapid Oref plugin?</string>
     <string name="insulin_fiasp">Fiasp®</string>
-    <string name="insulin_novorapid">NovoRapid®</string>
+    <string name="insulin_novorapid">NovoRapid®/Novolog®</string>
     <string name="insulin_humalog">Humalog®</string>
-    <string name="insulin_actrapid">Actrapid®</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_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: 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">In Treatments, delete the incorrect carb entry. Enter new carbs.</string>

From b608d25599724642c2cd0527791811be3f8f8959 Mon Sep 17 00:00:00 2001
From: Matthew Gray <mattnc30@hotmail.com>
Date: Thu, 29 Oct 2020 14:00:02 +0000
Subject: [PATCH 04/26] Can't remember if I did a commit when I stopped work
 yesterday. Doing one before I start.

---
 .../plugins/constraints/objectives/objectives/Objective2.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 b7d92b64fb..063fa3911f 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
@@ -39,7 +39,7 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.offlineprofile_nsprofile, true))
                 .hint(new Hint(R.string.offlineprofile_hint1))
         );
-        tasks.add(new ExamTask(R.string.pumpdisconnect_label,"pumpdisconnect")
+        tasks.add(new ExamTask(R.string.pumpdisconnect_label, R.string.pumpdisconnect_label,"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))

From 5b1cf6cd0c6d617d466f3973181b894d1eb35a27 Mon Sep 17 00:00:00 2001
From: Matthew Gray <mattnc30@hotmail.com>
Date: Fri, 30 Oct 2020 14:06:50 +0000
Subject: [PATCH 05/26] Questions in.

---
 .../objectives/objectives/Objective2.java     | 256 ++++++++++--------
 app/src/main/res/values/exam.xml              |  96 +++----
 app/src/main/res/values/objectives.xml        |   6 +-
 3 files changed, 187 insertions(+), 171 deletions(-)

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 063fa3911f..7cfc304d71 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
@@ -19,6 +19,27 @@ public class Objective2 extends Objective {
 
     @Override
     protected void setupTasks(List<Task> tasks) {
+        tasks.add(new ExamTask(R.string.prerequisites_label, R.string.prerequisites_what, "prerequisites")
+                .option(new Option(R.string.prerequisites_nightscout, true))
+                .option(new Option(R.string.prerequisites_computer, true))
+                .option(new Option(R.string.prerequisites_pump, true))
+                .option(new Option(R.string.prerequisites_beanandroiddeveloper, false))
+                .hint(new Hint(R.string.prerequisites_hint1))
+        );
+        tasks.add(new ExamTask(R.string.prerequisites2_label, R.string.prerequisites2_what, "prerequisites")
+                .option(new Option(R.string.prerequisites2_profile, true))
+                .option(new Option(R.string.prerequisites2_device, true))
+                .option(new Option(R.string.prerequisites2_internet, false))
+                .option(new Option(R.string.prerequisites2_supportedcgm, true))
+                .hint(new Hint(R.string.prerequisites2_hint1))
+        );
+        tasks.add(new ExamTask(R.string.basaltest_label, R.string.basaltest_when,"basaltest")
+                .option(new Option(R.string.basaltest_fixed, false))
+                .option(new Option(R.string.basaltest_havingregularhighlow, true))
+                .option(new Option(R.string.basaltest_weekly, false))
+                .option(new Option(R.string.basaltest_beforeloop, true))
+                .hint(new Hint(R.string.basaltest_hint1))
+        );
         tasks.add(new ExamTask(R.string.dia_label_exam, R.string.dia_whatmeansdia,"dia")
                 .option(new Option(R.string.dia_profile, true))
                 .option(new Option(R.string.dia_minimumis5h, true))
@@ -26,6 +47,22 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.dia_valuemustbedetermined, true))
                 .hint(new Hint(R.string.dia_hint1))
         );
+        tasks.add(new ExamTask(R.string.isf_label_exam, R.string.whatistrue,"isf")
+                .option(new Option(R.string.isf_decreasingvalue, true))
+                .option(new Option(R.string.isf_preferences, false))
+                .option(new Option(R.string.isf_increasingvalue, false))
+                .option(new Option(R.string.isf_noeffect, false))
+                .option(new Option(R.string.isf_profile, false))
+                .hint(new Hint(R.string.isf_hint1))
+                .hint(new Hint(R.string.isf_hint2))
+        );
+        tasks.add(new ExamTask(R.string.ic_label_exam, R.string.whatistrue,"ic")
+                .option(new Option(R.string.ic_increasingvalue, false))
+                .option(new Option(R.string.ic_decreasingvalue, true))
+                .option(new Option(R.string.ic_multiple, true))
+                .option(new Option(R.string.ic_isf, false))
+                .hint(new Hint(R.string.ic_hint1))
+        );
         tasks.add(new ExamTask(R.string.hypott_label, R.string.hypott_whenhypott,"hypott")
                 .option(new Option(R.string.hypott_goinglow, false))
                 .option(new Option(R.string.hypott_exercise, false))
@@ -33,37 +70,27 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.hypott_0basal, false))
                 .hint(new Hint(R.string.hypott_hint1))
         );
-        tasks.add(new ExamTask(R.string.offlineprofile_label, R.string.offlineprofile_whatprofile,"offlineprofile")
-                .option(new Option(R.string.localprofile, true))
-                .option(new Option(R.string.nsprofile, false))
-                .option(new Option(R.string.offlineprofile_nsprofile, true))
-                .hint(new Hint(R.string.offlineprofile_hint1))
+        tasks.add(new ExamTask(R.string.profileswitch_label, R.string.profileswitch_pctwillchange,"profileswitch")
+                .option(new Option(R.string.profileswitch_basallower, true))
+                .option(new Option(R.string.profileswitch_isfhigher, true))
+                .option(new Option(R.string.profileswitch_iclower, true))
+                .option(new Option(R.string.profileswitch_unchanged, false))
+                .hint(new Hint(R.string.profileswitch_hint1))
         );
-        tasks.add(new ExamTask(R.string.pumpdisconnect_label, R.string.pumpdisconnect_label,"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))
-                .option(new Option(R.string.pumpdisconnect_openloop, false))
-                .hint(new Hint(R.string.pumpdisconnect_hint1))
+        tasks.add(new ExamTask(R.string.profileswitch_label, R.string.profileswitch_pctwillchange,"profileswitch2")
+                        .option(new Option(R.string.profileswitch2_bghigher, true))
+                        .option(new Option(R.string.profileswitch2_basalhigher, true))
+                        .option(new Option(R.string.profileswitch2_bgunchanged, true))
+                        .option(new Option(R.string.profileswitch2_isfhigher, false))
+                        .hint(new Hint(R.string.profileswitch_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))
-                .hint(new Hint(R.string.objectives_hint1))
-                .hint(new Hint(R.string.objectives_hint2))
-        );
-        tasks.add(new ExamTask(R.string.noisycgm_label, R.string.noisycgm_whattodo,"noisycgm")
-                .option(new Option(R.string.nothing, false))
-                .option(new Option(R.string.disconnectpumpfor1h, false))
-                .option(new Option(R.string.noisycgm_pause, true))
-                .option(new Option(R.string.noisycgm_replacesensor, true))
-                .option(new Option(R.string.noisycgm_turnoffphone, false))
-                .option(new Option(R.string.noisycgm_checksmoothing, true))
-                .hint(new Hint(R.string.noisycgm_hint1))
+        tasks.add(new ExamTask(R.string.profileswitch_label, R.string.profileswitchtime_iwant,"profileswitchtime")
+                .option(new Option(R.string.profileswitchtime_2, false))
+                .option(new Option(R.string.profileswitchtime__2, true))
+                .option(new Option(R.string.profileswitchtime_tt, false))
+                .option(new Option(R.string.profileswitchtime_100, false))
+                .hint(new Hint(R.string.profileswitchtime_hint1))
         );
         tasks.add(new ExamTask(R.string.exerciseprofile_label, R.string.exercise_whattodo,"exercise")
                 .option(new Option(R.string.exerciseprofile_switchprofileabove100, false))
@@ -79,52 +106,12 @@ 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.suspendloop_label, R.string.suspendloop_doigetinsulin,"suspendloop")
-                .option(new Option(R.string.suspendloop_yes, true))
-                .option(new Option(R.string.suspendloop_no, false))
-        );
-       tasks.add(new ExamTask(R.string.basaltest_label, R.string.basaltest_when,"basaltest")
-                .option(new Option(R.string.basaltest_fixed, false))
-                .option(new Option(R.string.basaltest_havingregularhighlow, true))
-                .option(new Option(R.string.basaltest_weekly, false))
-               .option(new Option(R.string.basaltest_beforeloop, true))
-                 .hint(new Hint(R.string.basaltest_hint1))
-        );
-       tasks.add(new ExamTask(R.string.basalhelp_label, R.string.basalhelp_where,"basalhelp")
-                .option(new Option(R.string.basalhelp_diabetesteam, true))
-                .option(new Option(R.string.basalhelp_google, false))
-                .option(new Option(R.string.basalhelp_facebook, false))
-                 .hint(new Hint(R.string.basalhelp_hint1))
-        );
-       tasks.add(new ExamTask(R.string.prerequisites_label, R.string.prerequisites_what, "prerequisites")
-               .option(new Option(R.string.prerequisites_nightscout, true))
-               .option(new Option(R.string.prerequisites_computer, true))
-               .option(new Option(R.string.prerequisites_pump, true))
-               .option(new Option(R.string.prerequisites_beanandroiddeveloper, false))
-                .hint(new Hint(R.string.prerequisites_hint1))
-        );
-        tasks.add(new ExamTask(R.string.prerequisites2_label, R.string.prerequisites2_what, "prerequisites")
-                .option(new Option(R.string.prerequisites2_profile, true))
-                .option(new Option(R.string.prerequisites2_device, true))
-                .option(new Option(R.string.prerequisites2_internet, false))
-                .option(new Option(R.string.prerequisites2_supportedcgm, true))
-                .hint(new Hint(R.string.prerequisites2_hint1))
-        );
-                tasks.add(new ExamTask(R.string.update_label, R.string.whatistrue,"update")
-                .option(new Option(R.string.update_git, true))
-                .option(new Option(R.string.update_askfriend, false))
-                .option(new Option(R.string.update_keys, true))
-                .option(new Option(R.string.update_asap, false))
-                .hint(new Hint(R.string.update_hint1))
-        );
-        tasks.add(new ExamTask(R.string.troubleshooting_label, R.string.troubleshooting_wheretoask,"troubleshooting")
-                .option(new Option(R.string.troubleshooting_fb, true))
-                .option(new Option(R.string.troubleshooting_wiki, true))
-                .option(new Option(R.string.troubleshooting_gitter, true))
-                .option(new Option(R.string.troubleshooting_yourendo, false))
-                .hint(new Hint(R.string.troubleshooting_hint1))
-                .hint(new Hint(R.string.troubleshooting_hint2))
-                .hint(new Hint(R.string.troubleshooting_hint3))
+        tasks.add(new ExamTask(R.string.pumpdisconnect_label, R.string.pumpdisconnect_label,"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))
+                .option(new Option(R.string.pumpdisconnect_openloop, false))
+                .hint(new Hint(R.string.pumpdisconnect_hint1))
         );
         tasks.add(new ExamTask(R.string.insulin_label, R.string.insulin_ultrarapid,"insulin")
                 .option(new Option(R.string.insulin_novorapid, false))
@@ -145,14 +132,85 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.sensitivityaaps, false))
                 .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))
+                .hint(new Hint(R.string.objectives_hint1))
+                .hint(new Hint(R.string.objectives_hint2))
+        );
+        tasks.add(new ExamTask(R.string.update_label, R.string.whatistrue,"update")
+                .option(new Option(R.string.update_git, true))
+                .option(new Option(R.string.update_askfriend, false))
+                .option(new Option(R.string.update_keys, true))
+                .option(new Option(R.string.update_asap, false))
+                .hint(new Hint(R.string.update_hint1))
+        );
+        tasks.add(new ExamTask(R.string.troubleshooting_label, R.string.troubleshooting_wheretoask,"troubleshooting")
+                .option(new Option(R.string.troubleshooting_fb, true))
+                .option(new Option(R.string.troubleshooting_wiki, true))
+                .option(new Option(R.string.troubleshooting_gitter, true))
+                .option(new Option(R.string.troubleshooting_yourendo, false))
+                .hint(new Hint(R.string.troubleshooting_hint1))
+                .hint(new Hint(R.string.troubleshooting_hint2))
+                .hint(new Hint(R.string.troubleshooting_hint3))
+        );
         tasks.add(new ExamTask(R.string.wrongcarbs_label, R.string.wrongcarbs_whattodo,"wrongcarbs")
                 .option(new Option(R.string.wrongcarbs_addfakeinsulin, false))
                 .option(new Option(R.string.wrongcarbs_treatmentstab, true))
+                .option(new Option(R.string.wrongcarbs_donothing, false))
+                .option(new Option(R.string.wrongcarbs_bolus, false))
+        );
+        tasks.add(new ExamTask(R.string.wronginsulin_label, R.string.wronginsulin_whattodo,"wronginsulin")
+                .option(new Option(R.string.wronginsulin_careportal, false))
+                .option(new Option(R.string.wronginsulin_bolus, false))
+                .option(new Option(R.string.wronginsulin_prime, true))
+                .option(new Option(R.string.wrongcarbs_donothing, false))
+        );
+        tasks.add(new ExamTask(R.string.iob_label, R.string.iob_which,"iob")
+                .option(new Option(R.string.iob_deviation, true))
+                .option(new Option(R.string.iob_hightemp, false))
+                .option(new Option(R.string.iob_negiob, true))
+                .option(new Option(R.string.iob_posiob, true))
+
+
+        );
+        tasks.add(new ExamTask(R.string.offlineprofile_label, R.string.offlineprofile_whatprofile,"offlineprofile")
+                .option(new Option(R.string.localprofile, true))
+                .option(new Option(R.string.nsprofile, false))
+                .option(new Option(R.string.offlineprofile_nsprofile, true))
+                .hint(new Hint(R.string.offlineprofile_hint1))
+
+        );
+        tasks.add(new ExamTask(R.string.noisycgm_label, R.string.noisycgm_whattodo,"noisycgm")
+                .option(new Option(R.string.nothing, false))
+                .option(new Option(R.string.disconnectpumpfor1h, false))
+                .option(new Option(R.string.noisycgm_pause, true))
+                .option(new Option(R.string.noisycgm_replacesensor, true))
+                .option(new Option(R.string.noisycgm_turnoffphone, false))
+                .option(new Option(R.string.noisycgm_checksmoothing, true))
+                .hint(new Hint(R.string.noisycgm_hint1))
+
+        );
+       tasks.add(new ExamTask(R.string.suspendloop_label, R.string.suspendloop_doigetinsulin,"suspendloop")
+                .option(new Option(R.string.suspendloop_yes, true))
+                .option(new Option(R.string.suspendloop_no, false))
+        );
+
+       tasks.add(new ExamTask(R.string.basalhelp_label, R.string.basalhelp_where,"basalhelp")
+                .option(new Option(R.string.basalhelp_diabetesteam, true))
+                .option(new Option(R.string.basalhelp_google, false))
+                .option(new Option(R.string.basalhelp_facebook, false))
+                 .hint(new Hint(R.string.basalhelp_hint1))
         );
         tasks.add(new ExamTask(R.string.extendedcarbs_label, R.string.extendedcarbs_handling,"extendedcarbs")
-                .option(new Option(R.string.extendedcarbs_useextendedcarbs, true))
-                .option(new Option(R.string.extendedcarbs_add, false))
-                .option(new Option(R.string.extendedcarbs_useextendedbolus, false))
+                .option(new Option(R.string.extendedcarbs_future, true))
+                .option(new Option(R.string.extendedcarbs_free, false))
+                .option(new Option(R.string.extendedcarbs_fat, true))
+                .option(new Option(R.string.extendedcarbs_fat, false))
                 .hint(new Hint(R.string.extendedcarbs_hint1))
         );
         tasks.add(new ExamTask(R.string.nsclient_label, R.string.nsclient_howcanyou,"nsclient")
@@ -165,42 +223,12 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.nsclient_spikeiphone, true))
                 .hint(new Hint(R.string.nsclient_hint1))
         );
-        tasks.add(new ExamTask(R.string.isf_label_exam, R.string.whatistrue,"isf")
-                .option(new Option(R.string.isf_decreasingvalue, true))
-                .option(new Option(R.string.isf_preferences, false))
-                .option(new Option(R.string.isf_increasingvalue, false))
-                .option(new Option(R.string.isf_noeffect, false))
-                .option(new Option(R.string.isf_profile, false))
-                .hint(new Hint(R.string.isf_hint1))
-                .hint(new Hint(R.string.isf_hint2))
-        );
-        tasks.add(new ExamTask(R.string.ic_label_exam, R.string.whatistrue,"ic")
-                .option(new Option(R.string.ic_increasingvalue, false))
-                .option(new Option(R.string.ic_decreasingvalue, true))
-                .option(new Option(R.string.ic_multiple, true))
-                .option(new Option(R.string.ic_isf, false))
-                .hint(new Hint(R.string.ic_hint1))
-        );
-        tasks.add(new ExamTask(R.string.profileswitch_label, R.string.profileswitch_pctwillchange,"profileswitch")
-                .option(new Option(R.string.profileswitch_basalhigher, false))
-                .option(new Option(R.string.profileswitch_basallower, true))
-                .option(new Option(R.string.profileswitch_ichigher, true))
-                .option(new Option(R.string.profileswitch_iclower, false))
-                .option(new Option(R.string.profileswitch_isfhigher, true))
-                .option(new Option(R.string.profileswitch_isflower, false))
-                .option(new Option(R.string.profileswitch_overall, true))
-                .option(new Option(R.string.profileswitch_targethigher, false))
-                .option(new Option(R.string.profileswitch_targetlower, false))
-                .option(new Option(R.string.profileswitch_targetbottom, false))
-                .hint(new Hint(R.string.profileswitch_hint1))
-        );
-
-        tasks.add(new ExamTask(R.string.profileswitch_label, R.string.profileswitchtime_iwant,"profileswitchtime")
-                .option(new Option(R.string.profileswitchtime_2, false))
-                .option(new Option(R.string.profileswitchtime__2, true))
-                .option(new Option(R.string.profileswitchtime_tt, false))
-                .option(new Option(R.string.profileswitchtime_100, false))
-                .hint(new Hint(R.string.profileswitchtime_hint1))
+        tasks.add(new ExamTask(R.string.nsclient_label, R.string.nsclient_howcanyou,"nsclient")
+                .option(new Option(R.string.nsclient_nightscout, true))
+                .option(new Option(R.string.nsclient_dexcomfollow, true))
+                .option(new Option(R.string.nsclient_data, true))
+                .option(new Option(R.string.nsclient_fullcontrol, false))
+                .hint(new Hint(R.string.nsclient_hint1))
         );
 
         tasks.add(new ExamTask(R.string.other_medication_label, R.string.other_medication_text,"otherMedicationWarning")
diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml
index 67b9d469da..c6182d2adb 100644
--- a/app/src/main/res/values/exam.xml
+++ b/app/src/main/res/values/exam.xml
@@ -43,8 +43,6 @@
     <string name="noisycgm_turnoffphone">Turn off the phone.</string>
     <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
     <string name="noisycgm_checksmoothing">Verify that your CGM app smoothes BG data.</string>
-
-
     <string name="exerciseprofile_label">Topic 8: Exercise and Profiles.</string>
     <string name="exerciseprofile_whattodo">How can you use profiles to best help the system deal with aerobic exercise?</string>
     <string name="exerciseprofile_switchprofilebelow100">Do a profile switch to more than 100%.</string>
@@ -52,8 +50,6 @@
     <string name="exercisprofilee_leaveat100">Leave the profile set to 100%.</string>
     <string name="exerciseprofile_suspendloop">Suspend the loop.</string>
     <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
-
-
     <string name="exercise_label">Topic 9: Exercise and Temporary Targets.</string>
     <string name="exercise_whattodo">How can you use temporary targets to best help the system deal with aerobic exercise?</string>
     <string name="exercise_settt">Set an activity blood glucose target starting a suitable time before beginning exercise.</string>
@@ -61,21 +57,6 @@
     <string name="exercise_setunchanged">Leave your blood glucose target unchanged.</string>
     <string name="exercise_15g">Wait until blood glucose drops below your hypo temp target and then eat 15 g of fast acting carbohydrates.</string>
     <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     <string name="suspendloop_label">Topic: Disabled/Suspended loop</string>
     <string name="suspendloop_doigetinsulin">Do I receive insulin when the loop is disabled/suspended?</string>
     <string name="suspendloop_yes">Yes, basal insulin continues to be delivered.</string>
@@ -87,7 +68,7 @@
     <string name="basaltest_weekly">At least once per week.</string>
     <string name="basaltest_fixed">Once set and validated, these values should not change over time.</string>
     <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
-    <string name="prerequisites_label">Topic: Prerequisites</string>
+    <string name="prerequisites_label">Topic 1: Prerequisites</string>
     <string name="prerequisites_what">What is essential to set up and use AndroidAPS?</string>
     <string name="prerequisites_determinedcorrectprofile">Validated profile information (Basal, IC, ISF, DIA).</string>
     <string name="prerequisites_computer">A computer with Android Studio installed and configured.</string>
@@ -102,7 +83,7 @@
     <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
     <string name="prerequisites_smartwatch">A Smartwatch.</string>
     <string name="prerequisites_supportedcgm">A Supported CGM.</string>
-    <string name="prerequisites2_label">Topic: More Prerequisites</string>
+    <string name="prerequisites2_label">Topic 1: More Prerequisites</string>
     <string name="prerequisites2_what">What is essential to set up and use AndroidAPS?</string>
     <string name="prerequisites2_profile">Validated information to set up a profile (ISF, I:C ratio, basal rates, DIA etc.).</string>
     <string name="prerequisites2_device">A compatible Android device (e.g. mobile/cell phone, full Android watch, or tablet).</string>
@@ -137,28 +118,36 @@
     <string name="sensitivity_which">Which sensitivity algorithm has a configurable time range?</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: Carb Entry Errors</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">In Treatments, delete the incorrect carb entry. Enter new carbs.</string>
+    <string name="wrongcarbs_treatmentstab">Delete the incorrect entry in Treatments and enter the correct new carb value.</string>
     <string name="wrongcarbs_addfakeinsulin">Add fake insulin by using Refill function</string>
-    <string name="extendedcarbs_label">Topic: Food with Fat and Protein</string>
-    <string name="extendedcarbs_handling">What to do if your food contains a large amount of fat and\/or proteins?</string>
-    <string name="extendedcarbs_useextendedcarbs">Recalculate fat and proteins to carbs and use \"Extended carbs\" feature.</string>
-    <string name="extendedcarbs_add">Recalculate fat and proteins to carbs and add it to bolus calculation.</string>
-    <string name="extendedcarbs_useextendedbolus">Use extended bolus to cover fat and proteins.</string>
+    <string name="wrongcarbs_donothing">Add fake insulin by using Refill function</string>
+    <string name="wrongcarbs_bolus">Add fake insulin by using Refill function</string>
+    <string name="wronginsulin_label">Topic 17: Insulin delivery/entry errors</string>
+    <string name="wronginsulin_whattodo">What should you do if you received less insulin than the pump history suggests e.g. due to an occlusion, a failed cannula or forgetting to reattach the pump after a shower? </string>
+    <string name="wronginsulin_careportal">Delete insulin data from Nightscout Careportal to remove it from the pump history.</string>
+    <string name="wronginsulin_bolus">Bolus the missing insulin using the Insulin button in Overview.</string>
+    <string name="wronginsulin_prime">Bolus a proportion of your calculated ‘missed’ insulin by either syringe/pen or using a prime.</string>
+    <string name="wronginsulin_donothing">Do nothing and allow AndroidAPS to correct any resulting high blood glucose level.</string>
+    <string name="iob_label">Topic 18: Insulin on Board (IOB)</string>
+    <string name="iob_which">Check all the correct answers.</string>
+    <string name="iob_deviation">IOB describes the current deviation from expected insulin required based on your profile and settings.</string>
+    <string name="iob_hightemp">High temp basal will not be given when your blood sugar is below target.</string>
+    <string name="iob_negiob">Negative IOB for a substantial period in the absence of exercise suggests your profile is too strong and less insulin is needed in your settings.</string>
+    <string name="iob_posiob">Positive IOB for a substantial period suggests insulin resistance or unannounced meals.</string>
+    <string name="extendedcarbs_label">Topic 19: What could you use e-carbs (extended carbs) for?</string>
+    <string name="extendedcarbs_future">To schedule carbs in the future, possibly distributed over an interval (similar to an extended bolus distributing insulin over an interval).</string>
+    <string name="extendedcarbs_free">For logging \'free\' exercise carbs you want to hide from AndroidAPS.</string>
+    <string name="extendedcarbs_fat">e-carbs (distributed in the future) can assist AndroidAPS in dealing with high fat/protein meals.</string>
+    <string name="extendedcarbs_rescue">For logging rescue carbs you use to treat low blood glucose. </string>
     <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
-    <string name="nsclient_label">Topic: Remote Monitoring</string>
-    <string name="nsclient_howcanyou">How can you monitor AAPS of your child remotely?</string>
-    <string name="nsclient_nightscout">Using a Nightscout site.</string>
-    <string name="nsclient_dexcomfollow">Dexcom Follow app if you are using the original Dexcom app (BG only).</string>
-    <string name="nsclient_dexcomfollowxdrip">Dexcom Follow if you are using the xDrip app.</string>
-    <string name="nsclient_xdripfollower">xDrip running in follower mode.</string>
-    <string name="nsclient_looponiphone">Loop app on iPhone.</string>
-    <string name="nsclient_spikeiphone">Spike app on iPhone.</string>
+    <string name="nsclient_label">Topic 20: Remote Monitoring</string>
+    <string name="nsclient_howcanyou">How can you monitor AndroidAPS (for example for your child) remotely?</string>
+    <string name="nsclient_nightscout">NS Client app, Nightscout app and Nightscout webpage all allow you to follow AndroidAPS remotely.</string>
+    <string name="nsclient_dexcomfollow">Other apps (e.g. Dexcom follow, xDrip running in follow mode) allow you to follow some parameters (e.g. blood glucose/sensor values) remotely, but use different algorithms so may have inaccurate IOB or COB values..</string>
+    <string name="nsclient_data">To follow AndroidAPS remotely, both devices must have internet access (e.g. via Wi-Fi or mobile/cellular network data).</string>
+    <string name="nsclient_fullcontrol">NS Client used as a remote follower will both monitor and provide full control of AndroidAPS.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
     <string name="isf_label_exam">Topic 4: Insulin Sensitivity Factor (ISF)</string>
     <string name="isf_increasingvalue">Raising ISF values will lead to more insulin delivery to cover a specific amount of carbs.</string>
@@ -175,24 +164,23 @@
     <string name="ic_isf">If you change your ISF in your profile you should always change your I:C ratio too.</string>
     <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
     <string name="profileswitch_label">Topic 7: Profile Switching</string>
-    <string name="profileswitch_pctwillchange"> When specifying 90% in profile switch…</string>
-    <string name="profileswitch_basalhigher">Basals will be 10% higher.</string>
-    <string name="profileswitch_basallower">Basals will be 10% lower.</string>
-    <string name="profileswitch_ichigher">IC value will be 10% higher.</string>
-    <string name="profileswitch_iclower">IC value will be 10% lower.</string>
-    <string name="profileswitch_isfhigher">ISF value will be 10% higher.</string>
-    <string name="profileswitch_isflower">ISF value will be 10% lower.</string>
-    <string name="profileswitch_overall">You will get around 10% less insulin in total.</string>
-    <string name="profileswitch_targethigher">Target wiil be 10% higher.</string>
-    <string name="profileswitch_targetlower">Target will be 10% lower.</string>
-    <string name="profileswitch_targetbottom">Only bottom target will be 10% lower.</string>
+    <string name="profileswitch_pctwillchange"> When specifying a 90% profile switch, which answers are true?</string>
+    <string name="profileswitch_basalhigher">Basal rates will be 10% higher.</string>
+    <string name="profileswitch_basallower">Basal rates will be 10% lower.</string>
+    <string name="profileswitch_iclower">I:C ratios will be 10% lower.</string>
+    <string name="profileswitch_unchanged">ISF and I:C rations will be unchanged.</string>
     <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
+    <string name="profileswitch2_pctwillchange"> When specifying a 120% profile switch, which answers are true?</string>
+    <string name="profileswitch2_bghigher">Target blood glucose will be 20% higher.</string>
+    <string name="profileswitch2_basalhigher">Basal rates will be 20% higher.</string>
+    <string name="profileswitch2_bgunchanged">Target blood glucose will be unchanged.</string>
+    <string name="profileswitch2_isfhigher">ISF will be 20% higher.</string>
     <string name="profileswitchtime_iwant">If you get up 2 hours earlier than usual, how should you notify AndroidAPS of the change in your schedule?</string>
-    <string name="profileswitchtime_2">Initiate a profile switch with a timeshift of 1</string>
-    <string name="profileswitchtime__2">Initiate a profile switch with a timeshift of -1</string>
-    <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
+    <string name="profileswitchtime_2">Initiate a profile switch with a timeshift of 2</string>
+    <string name="profileswitchtime__2">Initiate a profile switch with a timeshift of -2</string>
     <string name="profileswitchtime_tt">Set an eating soon temporary target.</string>
     <string name="profileswitchtime_100">Do a profile switch to more than 100%. </string>
+    <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
     <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
     <string name="basalhelp_label">Topic: Help with basal rates</string>
     <string name="basalhelp_where">Where to go for help with basalrate etc.</string>
diff --git a/app/src/main/res/values/objectives.xml b/app/src/main/res/values/objectives.xml
index 5c4c1a11c2..c96f7473ca 100644
--- a/app/src/main/res/values/objectives.xml
+++ b/app/src/main/res/values/objectives.xml
@@ -34,7 +34,7 @@
     <string name="objectives_smb_objective">Enabling additional features for daytime use, such as SMB</string>
     <string name="objectives_auto_objective">Enabling automation</string>
     <string name="objectives_smb_gate">You must read the wiki and rise maxIOB to get SMBs working fine! A good start is maxIOB=average mealbolus + 3 x max daily basal</string>
-    <string name="objectives_auto_gate">Read the docs how automation works. Setup your first simple rules. Instead of action let AAPS display only notification. When you are sure automation is triggered at the right time replace notification by real action. (https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
+    <string name="objectives_auto_gate">Read the docs on how automation works. Set up your first simple rules. Instead of action let AAPS display only notification. When you are sure automation is triggered at the right time replace notification by real action. (https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
     <string name="objectives_bgavailableinns">BG available in NS</string>
     <string name="objectives_pumpstatusavailableinns">Pump status available in NS</string>
     <string name="objectives_manualenacts">Manual enacts</string>
@@ -49,11 +49,11 @@
     <string name="objectives_useloop">Display content of Loop plugin</string>
     <string name="objectives_usescale">Use scale function by long-pressing BG chart</string>
     <string name="objectives_button_enter">Enter</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">If you have at least 3 month of closed loop experience with other systems you might qualify for a code to skip objectives. See https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives for details.</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">If you have at least 3 months of closed loop experience with other systems you might qualify for a code to skip objectives. See https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives for details.</string>
     <string name="codeaccepted">Code accepted</string>
     <string name="codeinvalid">Code invalid</string>
     <string name="objectives_exam_objective">Prove your knowledge</string>
-    <string name="objectives_exam_gate">Study and answer questions correctly</string>
+    <string name="objectives_exam_gate">Study the questions.  You are given four possible answers for each question. There may be more than one correct answer. Please check all those that are correct.</string>
     <string name="answerdisabledto">Answering disabled until: %1$s</string>
     <string name="wronganswer">Wrong answer!</string>
     <string name="unfinshed_button">Next unfinished</string>

From beb4c6a206bed4c3468a248d1e94d8c606e9c025 Mon Sep 17 00:00:00 2001
From: Matthew Gray <mattnc30@hotmail.com>
Date: Fri, 30 Oct 2020 14:21:41 +0000
Subject: [PATCH 06/26] Fix isf question.

---
 app/src/main/res/values/exam.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml
index c6182d2adb..663062d408 100644
--- a/app/src/main/res/values/exam.xml
+++ b/app/src/main/res/values/exam.xml
@@ -166,7 +166,7 @@
     <string name="profileswitch_label">Topic 7: Profile Switching</string>
     <string name="profileswitch_pctwillchange"> When specifying a 90% profile switch, which answers are true?</string>
     <string name="profileswitch_basalhigher">Basal rates will be 10% higher.</string>
-    <string name="profileswitch_basallower">Basal rates will be 10% lower.</string>
+    <string name="profileswitch_isfhigher">ISF will be 10% higher.</string>
     <string name="profileswitch_iclower">I:C ratios will be 10% lower.</string>
     <string name="profileswitch_unchanged">ISF and I:C rations will be unchanged.</string>
     <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>

From 46094f7cdaa21a32cbfb064136ad6c97d0ccd8ea Mon Sep 17 00:00:00 2001
From: Matthew Gray <mattnc30@hotmail.com>
Date: Fri, 30 Oct 2020 14:25:29 +0000
Subject: [PATCH 07/26] Fix isf question again.

---
 app/src/main/res/values/exam.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml
index 663062d408..d5bbcc4ed4 100644
--- a/app/src/main/res/values/exam.xml
+++ b/app/src/main/res/values/exam.xml
@@ -165,7 +165,7 @@
     <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
     <string name="profileswitch_label">Topic 7: Profile Switching</string>
     <string name="profileswitch_pctwillchange"> When specifying a 90% profile switch, which answers are true?</string>
-    <string name="profileswitch_basalhigher">Basal rates will be 10% higher.</string>
+    <string name="profileswitch_basallower">Basal rates will be 10% lower.</string>
     <string name="profileswitch_isfhigher">ISF will be 10% higher.</string>
     <string name="profileswitch_iclower">I:C ratios will be 10% lower.</string>
     <string name="profileswitch_unchanged">ISF and I:C rations will be unchanged.</string>

From e23c0a6d4f93049f673f9a0c66e3fedd8d72dfe5 Mon Sep 17 00:00:00 2001
From: Matthew Gray <mattnc30@hotmail.com>
Date: Fri, 30 Oct 2020 14:31:32 +0000
Subject: [PATCH 08/26] Fix ecarbs

---
 app/src/main/res/values/exam.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml
index d5bbcc4ed4..7558f9a71e 100644
--- a/app/src/main/res/values/exam.xml
+++ b/app/src/main/res/values/exam.xml
@@ -136,7 +136,8 @@
     <string name="iob_hightemp">High temp basal will not be given when your blood sugar is below target.</string>
     <string name="iob_negiob">Negative IOB for a substantial period in the absence of exercise suggests your profile is too strong and less insulin is needed in your settings.</string>
     <string name="iob_posiob">Positive IOB for a substantial period suggests insulin resistance or unannounced meals.</string>
-    <string name="extendedcarbs_label">Topic 19: What could you use e-carbs (extended carbs) for?</string>
+    <string name="extendedcarbs_label">Topic 19: e-carbs</string>
+    <string name="extendedcarbs_handling">What could you use e-carbs (extended carbs) for?</string>
     <string name="extendedcarbs_future">To schedule carbs in the future, possibly distributed over an interval (similar to an extended bolus distributing insulin over an interval).</string>
     <string name="extendedcarbs_free">For logging \'free\' exercise carbs you want to hide from AndroidAPS.</string>
     <string name="extendedcarbs_fat">e-carbs (distributed in the future) can assist AndroidAPS in dealing with high fat/protein meals.</string>

From ca343e7b2d0b6f0f8931825282fb4a47e65e6e6f Mon Sep 17 00:00:00 2001
From: Matthew Gray <mattnc30@hotmail.com>
Date: Fri, 30 Oct 2020 14:51:41 +0000
Subject: [PATCH 09/26] more tidying

---
 .../objectives/objectives/Objective2.java       | 17 +++--------------
 app/src/main/res/values/exam.xml                |  2 +-
 2 files changed, 4 insertions(+), 15 deletions(-)

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 7cfc304d71..7dcfd885b6 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
@@ -64,10 +64,10 @@ public class Objective2 extends Objective {
                 .hint(new Hint(R.string.ic_hint1))
         );
         tasks.add(new ExamTask(R.string.hypott_label, R.string.hypott_whenhypott,"hypott")
-                .option(new Option(R.string.hypott_goinglow, false))
-                .option(new Option(R.string.hypott_exercise, false))
                 .option(new Option(R.string.hypott_preventoversmb, true))
-                .option(new Option(R.string.hypott_0basal, false))
+                .option(new Option(R.string.hypott_exercise, false))
+                .option(new Option(R.string.hypott_wrongbasal, false))
+                .option(new Option(R.string.hypott_goinglow, false))
                 .hint(new Hint(R.string.hypott_hint1))
         );
         tasks.add(new ExamTask(R.string.profileswitch_label, R.string.profileswitch_pctwillchange,"profileswitch")
@@ -213,16 +213,6 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.extendedcarbs_fat, false))
                 .hint(new Hint(R.string.extendedcarbs_hint1))
         );
-        tasks.add(new ExamTask(R.string.nsclient_label, R.string.nsclient_howcanyou,"nsclient")
-                .option(new Option(R.string.nsclient_nightscout, true))
-                .option(new Option(R.string.nsclientinternal, true))
-                .option(new Option(R.string.nsclient_dexcomfollow, true))
-                .option(new Option(R.string.nsclient_dexcomfollowxdrip, false))
-                .option(new Option(R.string.nsclient_xdripfollower, true))
-                .option(new Option(R.string.nsclient_looponiphone, false))
-                .option(new Option(R.string.nsclient_spikeiphone, true))
-                .hint(new Hint(R.string.nsclient_hint1))
-        );
         tasks.add(new ExamTask(R.string.nsclient_label, R.string.nsclient_howcanyou,"nsclient")
                 .option(new Option(R.string.nsclient_nightscout, true))
                 .option(new Option(R.string.nsclient_dexcomfollow, true))
@@ -230,7 +220,6 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.nsclient_fullcontrol, false))
                 .hint(new Hint(R.string.nsclient_hint1))
         );
-
         tasks.add(new ExamTask(R.string.other_medication_label, R.string.other_medication_text,"otherMedicationWarning")
                 .option(new Option(R.string.yes, true))
                 .option(new Option(R.string.no, false))
diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml
index 7558f9a71e..3a307feb7f 100644
--- a/app/src/main/res/values/exam.xml
+++ b/app/src/main/res/values/exam.xml
@@ -9,7 +9,7 @@
     <string name="dia_valuemustbedetermined">You should determine for yourself the appropriate value for DIA.</string>
     <string name="hypott_label">Topic 6: Hypo Temp-Target</string>
     <string name="hypott_whenhypott">What is primary reason to set a hypo  temp target?</string>
-    <string name="hypott_goinglow">To prevent BG from going low if there is already zero temp running.</string>
+    <string name="hypott_wrongbasal">To correct for hypos caused by incorrect basal rate settings.</string>
     <string name="hypott_preventoversmb">To prevent AndroidAPS from overcorrecting for a blood glucose rise caused by the fast acting carbs used to treat a hypo.</string>
     <string name="hypott_exercise">To correct for a hypo induced as a result of exercise.</string>
     <string name="hypott_0basal">To prevent blood glucose from going low of there is already a 0% temporary basal rate running.</string>

From ed2a73339e942739d2d5f3e24a308fd247b5190d Mon Sep 17 00:00:00 2001
From: Matthew Gray <mattnc30@hotmail.com>
Date: Fri, 30 Oct 2020 14:56:03 +0000
Subject: [PATCH 10/26] more tidying

---
 .../plugins/constraints/objectives/objectives/Objective2.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 7dcfd885b6..47690d008f 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
@@ -67,7 +67,7 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.hypott_preventoversmb, true))
                 .option(new Option(R.string.hypott_exercise, false))
                 .option(new Option(R.string.hypott_wrongbasal, false))
-                .option(new Option(R.string.hypott_goinglow, false))
+                .option(new Option(R.string.hypott_0basal, false))
                 .hint(new Hint(R.string.hypott_hint1))
         );
         tasks.add(new ExamTask(R.string.profileswitch_label, R.string.profileswitch_pctwillchange,"profileswitch")

From cb71f550b965a2b35fd013eb2e2813b285c884ba Mon Sep 17 00:00:00 2001
From: Matthew Gray <mattnc30@hotmail.com>
Date: Fri, 30 Oct 2020 15:15:35 +0000
Subject: [PATCH 11/26] more tidying

---
 .../objectives/objectives/Objective2.java     | 31 -------------------
 app/src/main/res/values/objectives.xml        |  2 +-
 2 files changed, 1 insertion(+), 32 deletions(-)

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 47690d008f..97207208b2 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
@@ -83,7 +83,6 @@ public class Objective2 extends Objective {
                         .option(new Option(R.string.profileswitch2_bgunchanged, true))
                         .option(new Option(R.string.profileswitch2_isfhigher, false))
                         .hint(new Hint(R.string.profileswitch_hint1))
-
         );
         tasks.add(new ExamTask(R.string.profileswitch_label, R.string.profileswitchtime_iwant,"profileswitchtime")
                 .option(new Option(R.string.profileswitchtime_2, false))
@@ -175,36 +174,6 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.iob_hightemp, false))
                 .option(new Option(R.string.iob_negiob, true))
                 .option(new Option(R.string.iob_posiob, true))
-
-
-        );
-        tasks.add(new ExamTask(R.string.offlineprofile_label, R.string.offlineprofile_whatprofile,"offlineprofile")
-                .option(new Option(R.string.localprofile, true))
-                .option(new Option(R.string.nsprofile, false))
-                .option(new Option(R.string.offlineprofile_nsprofile, true))
-                .hint(new Hint(R.string.offlineprofile_hint1))
-
-        );
-        tasks.add(new ExamTask(R.string.noisycgm_label, R.string.noisycgm_whattodo,"noisycgm")
-                .option(new Option(R.string.nothing, false))
-                .option(new Option(R.string.disconnectpumpfor1h, false))
-                .option(new Option(R.string.noisycgm_pause, true))
-                .option(new Option(R.string.noisycgm_replacesensor, true))
-                .option(new Option(R.string.noisycgm_turnoffphone, false))
-                .option(new Option(R.string.noisycgm_checksmoothing, true))
-                .hint(new Hint(R.string.noisycgm_hint1))
-
-        );
-       tasks.add(new ExamTask(R.string.suspendloop_label, R.string.suspendloop_doigetinsulin,"suspendloop")
-                .option(new Option(R.string.suspendloop_yes, true))
-                .option(new Option(R.string.suspendloop_no, false))
-        );
-
-       tasks.add(new ExamTask(R.string.basalhelp_label, R.string.basalhelp_where,"basalhelp")
-                .option(new Option(R.string.basalhelp_diabetesteam, true))
-                .option(new Option(R.string.basalhelp_google, false))
-                .option(new Option(R.string.basalhelp_facebook, false))
-                 .hint(new Hint(R.string.basalhelp_hint1))
         );
         tasks.add(new ExamTask(R.string.extendedcarbs_label, R.string.extendedcarbs_handling,"extendedcarbs")
                 .option(new Option(R.string.extendedcarbs_future, true))
diff --git a/app/src/main/res/values/objectives.xml b/app/src/main/res/values/objectives.xml
index c96f7473ca..e7ed79a212 100644
--- a/app/src/main/res/values/objectives.xml
+++ b/app/src/main/res/values/objectives.xml
@@ -53,7 +53,7 @@
     <string name="codeaccepted">Code accepted</string>
     <string name="codeinvalid">Code invalid</string>
     <string name="objectives_exam_objective">Prove your knowledge</string>
-    <string name="objectives_exam_gate">Study the questions.  You are given four possible answers for each question. There may be more than one correct answer. Please check all those that are correct.</string>
+    <string name="objectives_exam_gate">Study the questions.  You are given four possible answers for each question. There may be more than one correct answer. Please check all those that are correct and select VERIFY.</string>
     <string name="answerdisabledto">Answering disabled until: %1$s</string>
     <string name="wronganswer">Wrong answer!</string>
     <string name="unfinshed_button">Next unfinished</string>

From 159a465ff88a553899828b6bdf291de5cfad41c7 Mon Sep 17 00:00:00 2001
From: Matthew Gray <mattnc30@hotmail.com>
Date: Sun, 1 Nov 2020 14:22:08 +0000
Subject: [PATCH 12/26] All questions done.

Check SpIdentifier.
---
 .../objectives/objectives/Objective2.java     | 33 ++++++++++---------
 app/src/main/res/values/exam.xml              | 27 ++++++++-------
 2 files changed, 33 insertions(+), 27 deletions(-)

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>

From c42464da0636f1234c17c3dac349750af4b811fd Mon Sep 17 00:00:00 2001
From: Matthew Gray <mattnc30@hotmail.com>
Date: Tue, 3 Nov 2020 10:26:16 +0000
Subject: [PATCH 13/26] SpIdentifiers done.

---
 .../plugins/constraints/objectives/objectives/Objective2.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 cfb25a3d73..d20977fd9e 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
@@ -26,7 +26,7 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.prerequisites_beanandroiddeveloper, false))
                 .hint(new Hint(R.string.prerequisites_hint1))
         );
-        tasks.add(new ExamTask(R.string.prerequisites2_label, R.string.prerequisites2_what, "prerequisites")
+        tasks.add(new ExamTask(R.string.prerequisites2_label, R.string.prerequisites2_what, "prerequisites2")
                 .option(new Option(R.string.prerequisites2_profile, true))
                 .option(new Option(R.string.prerequisites2_device, true))
                 .option(new Option(R.string.prerequisites2_internet, false))
@@ -98,7 +98,7 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.exerciseprofile_suspendloop, false))
                 .hint(new Hint(R.string.exerciseprofile_hint1))
         );
-        tasks.add(new ExamTask(R.string.exercise_label, R.string.exercise_whattodo,"exercise")
+        tasks.add(new ExamTask(R.string.exercise_label, R.string.exercise_whattodo,"exercise2")
                 .option(new Option(R.string.exercise_settt, false))
                 .option(new Option(R.string.exercise_setfinished, true))
                 .option(new Option(R.string.exercise_setunchanged, false))

From c5ee40b393d4dd9f3c7e38f46c1c3b8cd7e0299a Mon Sep 17 00:00:00 2001
From: Matthew Gray <mattnc30@hotmail.com>
Date: Tue, 3 Nov 2020 11:47:25 +0000
Subject: [PATCH 14/26] 1st build fixes.

---
 .../objectives/objectives/Objective2.java          | 14 +++++++-------
 app/src/main/res/values/exam.xml                   | 11 ++++++-----
 2 files changed, 13 insertions(+), 12 deletions(-)

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 d20977fd9e..a6ee06cd54 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
@@ -47,7 +47,7 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.dia_valuemustbedetermined, true))
                 .hint(new Hint(R.string.dia_hint1))
         );
-        tasks.add(new ExamTask(R.string.isf_label_exam, R.string.whatistrue,"isf")
+        tasks.add(new ExamTask(R.string.isf_label_exam, R.string.blank,"isf")
                 .option(new Option(R.string.isf_decreasingvalue, true))
                 .option(new Option(R.string.isf_preferences, false))
                 .option(new Option(R.string.isf_increasingvalue, false))
@@ -56,7 +56,7 @@ public class Objective2 extends Objective {
                 .hint(new Hint(R.string.isf_hint1))
                 .hint(new Hint(R.string.isf_hint2))
         );
-        tasks.add(new ExamTask(R.string.ic_label_exam, R.string.whatistrue,"ic")
+        tasks.add(new ExamTask(R.string.ic_label_exam, R.string.blank,"ic")
                 .option(new Option(R.string.ic_increasingvalue, false))
                 .option(new Option(R.string.ic_decreasingvalue, true))
                 .option(new Option(R.string.ic_multiple, true))
@@ -77,7 +77,7 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.profileswitch_unchanged, false))
                 .hint(new Hint(R.string.profileswitch_hint1))
         );
-        tasks.add(new ExamTask(R.string.profileswitch_label, R.string.profileswitch_pctwillchange,"profileswitch2")
+        tasks.add(new ExamTask(R.string.profileswitch_label, R.string.profileswitch2_pctwillchange,"profileswitch2")
                         .option(new Option(R.string.profileswitch2_bghigher, true))
                         .option(new Option(R.string.profileswitch2_basalhigher, true))
                         .option(new Option(R.string.profileswitch2_bgunchanged, true))
@@ -91,7 +91,7 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.profileswitchtime_100, false))
                 .hint(new Hint(R.string.profileswitchtime_hint1))
         );
-        tasks.add(new ExamTask(R.string.exerciseprofile_label, R.string.exercise_whattodo,"exercise")
+        tasks.add(new ExamTask(R.string.exerciseprofile_label, R.string.exerciseprofile_whattodo,"exercise")
                 .option(new Option(R.string.exerciseprofile_switchprofileabove100, false))
                 .option(new Option(R.string.exerciseprofile_switchprofilebelow100, true))
                 .option(new Option(R.string.exerciseprofile_suspendloop, false))
@@ -142,11 +142,11 @@ public class Objective2 extends Objective {
                 .hint(new Hint(R.string.objectives_hint1))
                 .hint(new Hint(R.string.objectives_hint2))
         );
-        tasks.add(new ExamTask(R.string.update_label, R.string.whatistrue,"update")
+        tasks.add(new ExamTask(R.string.update_label, R.string.blank,"update")
                 .option(new Option(R.string.update_git, true))
                 .option(new Option(R.string.update_askfriend, false))
                 .option(new Option(R.string.update_keys, true))
-                .option(new Option(R.string.update_asap, false))
+                .option(new Option(R.string.update_asap, true))
                 .hint(new Hint(R.string.update_hint1))
         );
         tasks.add(new ExamTask(R.string.troubleshooting_label, R.string.troubleshooting_wheretoask,"troubleshooting")
@@ -159,7 +159,7 @@ public class Objective2 extends Objective {
                 .hint(new Hint(R.string.troubleshooting_hint3))
         );
         tasks.add(new ExamTask(R.string.wrongcarbs_label, R.string.wrongcarbs_whattodo,"wrongcarbs")
-                .option(new Option(R.string.wrongcarbs_addfakeinsulin, false))
+                .option(new Option(R.string.wrongcarbs_addinsulin, false))
                 .option(new Option(R.string.wrongcarbs_treatmentstab, true))
                 .option(new Option(R.string.wrongcarbs_donothing, false))
                 .option(new Option(R.string.wrongcarbs_bolus, false))
diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml
index 9d97fb0686..49e0c08972 100644
--- a/app/src/main/res/values/exam.xml
+++ b/app/src/main/res/values/exam.xml
@@ -32,7 +32,7 @@
     <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_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>
@@ -90,7 +90,7 @@
     <string name="prerequisites2_profile">Validated information to set up a profile (ISF, I:C ratio, basal rates, DIA etc.).</string>
     <string name="prerequisites2_device">A compatible Android device (e.g. mobile/cell phone, full Android watch, or tablet).</string>
     <string name="prerequisites2_internet">AndroidAPS requires an internet connection in order to run in closed loop.</string>
-    <string name="prerequisites2_supportedcgm">A Supported CGM and appropriate app to receive blood glucose values on the phone/device.</string>
+    <string name="prerequisites2_supportedcgm">A supported CGM and appropriate app to receive blood glucose values on the phone/device.</string>
     <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
     <string name="update_label">Topic 14: Updating AndroidAPS</string>
     <string name="whatistrue">Check all correct answers.</string>
@@ -126,9 +126,9 @@
     <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>
-    <string name="wrongcarbs_addfakeinsulin">Add fake insulin by using Refill function</string>
-    <string name="wrongcarbs_donothing">Add fake insulin by using Refill function</string>
-    <string name="wrongcarbs_bolus">Add fake insulin by using Refill function</string>
+    <string name="wrongcarbs_addinsulin">Bolus with insulin using the Insulin (bolus) button in Overview. </string>
+    <string name="wrongcarbs_donothing">Do nothing – AndroidAPS will make the appropriate adjustments.</string>
+    <string name="wrongcarbs_bolus">Bolus with insulin using the Insulin (bolus) button in Overview.</string>
     <string name="wronginsulin_label">Topic 17: Insulin delivery/entry errors</string>
     <string name="wronginsulin_whattodo">What should you do if you received less insulin than the pump history suggests e.g. due to an occlusion, a failed cannula or forgetting to reattach the pump after a shower? </string>
     <string name="wronginsulin_careportal">Delete insulin data from Nightscout Careportal to remove it from the pump history.</string>
@@ -193,6 +193,7 @@
     <string name="basalhelp_diabetesteam">Your diabetes team</string>
     <string name="basalhelp_google">Google</string>
     <string name="basalhelp_facebook">Facebook</string>
+    <string name="blank"></string>
     <string name="other_medication_label">Topic 21: Other Medication. Please read the statement below and then check the box to accept the declaration.</string>
     <string name="other_medication_text">AndroidAPS reduces basal rates or suspends insulin delivery to raise blood sugar. Drugs in the class SGLT2 inhibitors (gliflozins) can prevent increases in blood glucose and therefore can produce a dangerous insulin deficiency leading to DKA.
 \nCommon brand names are: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nI hereby promise that I will not take such drugs when using AndroidAPS or will deactivate the loop before using such drugs.</string>

From d0037886ba81c0a6708191a4ca81c1ad46075c7f Mon Sep 17 00:00:00 2001
From: Matthew Gray <mattnc30@hotmail.com>
Date: Tue, 3 Nov 2020 12:08:32 +0000
Subject: [PATCH 15/26] 1st build fixes.

---
 .../objectives/objectives/Objective2.java     | 14 +++++++-------
 app/src/main/res/values/exam.xml              | 19 +++++++++++--------
 2 files changed, 18 insertions(+), 15 deletions(-)

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 a6ee06cd54..8c8aec899f 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
@@ -77,14 +77,14 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.profileswitch_unchanged, false))
                 .hint(new Hint(R.string.profileswitch_hint1))
         );
-        tasks.add(new ExamTask(R.string.profileswitch_label, R.string.profileswitch2_pctwillchange,"profileswitch2")
+        tasks.add(new ExamTask(R.string.profileswitch2_label, R.string.profileswitch2_pctwillchange,"profileswitch2")
                         .option(new Option(R.string.profileswitch2_bghigher, true))
                         .option(new Option(R.string.profileswitch2_basalhigher, true))
                         .option(new Option(R.string.profileswitch2_bgunchanged, true))
                         .option(new Option(R.string.profileswitch2_isfhigher, false))
                         .hint(new Hint(R.string.profileswitch_hint1))
         );
-        tasks.add(new ExamTask(R.string.profileswitch_label, R.string.profileswitchtime_iwant,"profileswitchtime")
+        tasks.add(new ExamTask(R.string.profileswitchtime_label, R.string.profileswitchtime_iwant,"profileswitchtime")
                 .option(new Option(R.string.profileswitchtime_2, false))
                 .option(new Option(R.string.profileswitchtime__2, true))
                 .option(new Option(R.string.profileswitchtime_tt, false))
@@ -134,11 +134,11 @@ public class Objective2 extends Objective {
                 .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))
+        tasks.add(new ExamTask(R.string.objectives2_label, R.string.objectives_howtosave,"objectives2")
+                .option(new Option(R.string.objectives2_maintenance, true))
+                .option(new Option(R.string.objectives2_internalstorage, true))
+                .option(new Option(R.string.objectives2_cloud, true))
+                .option(new Option(R.string.objectives2_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 49e0c08972..2d3ce614e2 100644
--- a/app/src/main/res/values/exam.xml
+++ b/app/src/main/res/values/exam.xml
@@ -18,7 +18,7 @@
     <string name="offlineprofile_label">Topic: Offline Profile</string>
     <string name="offlineprofile_nsprofile">NS Profile can be used, but not configured.</string>
     <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
-    <string name="pumpdisconnect_label">Topic 10: Reasons for applying "Disconnect pump" in AndroidAPS.</string>
+    <string name="pumpdisconnect_label">Topic 10: Reasons for applying "Disconnect pump" in AndroidAPS</string>
     <string name="pumpdisconnect_whattodo">What should be done when disconnecting the pump?</string>
     <string name="pumpdisconnect_unnecessary">This is unnecessary as insulin will not be delivered if the pump is physically disconnected.</string>
     <string name="pumpdisconnect_missinginsulin">It prevents AndroidAPS from accounting for insulin that was not delivered whilst the pump is physically disconnected. </string>
@@ -26,15 +26,16 @@
     <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 13: AndroidAPS Settings</string>
+    <string name="objectives2_label">Topic 13: More 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="objectives2_maintenance">Export your settings locally using the maintenance menu.</string>
+    <string name="objectives2_internalstorage">Your settings file is found in the folder Internal Storage/AndroidAPS/preferences on your phone.</string>
+    <string name="objectives2_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="objectives2_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>
@@ -45,14 +46,14 @@
     <string name="noisycgm_turnoffphone">Turn off the phone.</string>
     <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
     <string name="noisycgm_checksmoothing">Verify that your CGM app smoothes BG data.</string>
-    <string name="exerciseprofile_label">Topic 8: Exercise and Profiles.</string>
+    <string name="exerciseprofile_label">Topic 8: Exercise and Profiles</string>
     <string name="exerciseprofile_whattodo">How can you use profiles to best help the system deal with aerobic exercise?</string>
     <string name="exerciseprofile_switchprofilebelow100">Do a profile switch to more than 100%.</string>
     <string name="exerciseprofile_switchprofileabove100">Do a profile switch to less than 100%. </string>
     <string name="exercisprofilee_leaveat100">Leave the profile set to 100%.</string>
     <string name="exerciseprofile_suspendloop">Suspend the loop.</string>
     <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
-    <string name="exercise_label">Topic 9: Exercise and Temporary Targets.</string>
+    <string name="exercise_label">Topic 9: Exercise and Temporary Targets</string>
     <string name="exercise_whattodo">How can you use temporary targets to best help the system deal with aerobic exercise?</string>
     <string name="exercise_settt">Set an activity blood glucose target starting a suitable time before beginning exercise.</string>
     <string name="exercise_setfinished">Set an activity blood glucose target after finishing exercise.</string>
@@ -169,18 +170,20 @@
     <string name="ic_multiple">You can use more than one value for I:C ratio in your profile.</string>
     <string name="ic_isf">If you change your ISF in your profile you should always change your I:C ratio too.</string>
     <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
-    <string name="profileswitch_label">Topic 7: Profile Switching</string>
+    <string name="profileswitch_label">Topic 7: Profile Switching 1</string>
     <string name="profileswitch_pctwillchange"> When specifying a 90% profile switch, which answers are true?</string>
     <string name="profileswitch_basallower">Basal rates will be 10% lower.</string>
     <string name="profileswitch_isfhigher">ISF will be 10% higher.</string>
     <string name="profileswitch_iclower">I:C ratios will be 10% lower.</string>
     <string name="profileswitch_unchanged">ISF and I:C rations will be unchanged.</string>
     <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
+    <string name="profileswitch2_label">Topic 7: Profile Switching 2</string>
     <string name="profileswitch2_pctwillchange"> When specifying a 120% profile switch, which answers are true?</string>
     <string name="profileswitch2_bghigher">Target blood glucose will be 20% higher.</string>
     <string name="profileswitch2_basalhigher">Basal rates will be 20% higher.</string>
     <string name="profileswitch2_bgunchanged">Target blood glucose will be unchanged.</string>
     <string name="profileswitch2_isfhigher">ISF will be 20% higher.</string>
+    <string name="profileswitchtime_label">Topic 7: Profile Switching 3</string>
     <string name="profileswitchtime_iwant">If you get up 2 hours earlier than usual, how should you notify AndroidAPS of the change in your schedule?</string>
     <string name="profileswitchtime_2">Initiate a profile switch with a timeshift of 2</string>
     <string name="profileswitchtime__2">Initiate a profile switch with a timeshift of -2</string>

From 4e914d213bee51c15687412df24fd4c15cf0ced3 Mon Sep 17 00:00:00 2001
From: Matthew Gray <mattnc30@hotmail.com>
Date: Tue, 3 Nov 2020 13:29:45 +0000
Subject: [PATCH 16/26] 2nd build fixes.

---
 .../objectives/objectives/Objective2.java          | 14 +++++++-------
 app/src/main/res/values/exam.xml                   | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

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 8c8aec899f..89e80a66e2 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
@@ -78,7 +78,7 @@ public class Objective2 extends Objective {
                 .hint(new Hint(R.string.profileswitch_hint1))
         );
         tasks.add(new ExamTask(R.string.profileswitch2_label, R.string.profileswitch2_pctwillchange,"profileswitch2")
-                        .option(new Option(R.string.profileswitch2_bghigher, true))
+                        .option(new Option(R.string.profileswitch2_bghigher, false))
                         .option(new Option(R.string.profileswitch2_basalhigher, true))
                         .option(new Option(R.string.profileswitch2_bgunchanged, true))
                         .option(new Option(R.string.profileswitch2_isfhigher, false))
@@ -95,17 +95,17 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.exerciseprofile_switchprofileabove100, false))
                 .option(new Option(R.string.exerciseprofile_switchprofilebelow100, true))
                 .option(new Option(R.string.exerciseprofile_suspendloop, false))
-                .option(new Option(R.string.exerciseprofile_suspendloop, false))
+                .option(new Option(R.string.exerciseprofile_leaveat100, false))
                 .hint(new Hint(R.string.exerciseprofile_hint1))
         );
         tasks.add(new ExamTask(R.string.exercise_label, R.string.exercise_whattodo,"exercise2")
-                .option(new Option(R.string.exercise_settt, false))
-                .option(new Option(R.string.exercise_setfinished, true))
+                .option(new Option(R.string.exercise_settt, true))
+                .option(new Option(R.string.exercise_setfinished, false))
                 .option(new Option(R.string.exercise_setunchanged, false))
                 .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_whattodo,"pumpdisconnect")
+        tasks.add(new ExamTask(R.string.pumpdisconnect_label, R.string.blank,"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))
@@ -119,7 +119,7 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.insulin_fiasp, true))
                 .hint(new Hint(R.string.insulin_hint1))
         );
-        tasks.add(new ExamTask(R.string.sensitivity_label, R.string.sensitivity_which,"sensitivity")
+        tasks.add(new ExamTask(R.string.sensitivity_label, R.string.blank,"sensitivity")
                 .option(new Option(R.string.sensitivity_adjust, true))
                 .option(new Option(R.string.sensitivity_edit, false))
                 .option(new Option(R.string.sensitivity_cannula, true))
@@ -180,7 +180,7 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.extendedcarbs_future, true))
                 .option(new Option(R.string.extendedcarbs_free, false))
                 .option(new Option(R.string.extendedcarbs_fat, true))
-                .option(new Option(R.string.extendedcarbs_fat, false))
+                .option(new Option(R.string.extendedcarbs_rescue, false))
                 .hint(new Hint(R.string.extendedcarbs_hint1))
         );
         tasks.add(new ExamTask(R.string.nsclient_label, R.string.nsclient_howcanyou,"nsclient")
diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml
index 2d3ce614e2..ab4e0641bd 100644
--- a/app/src/main/res/values/exam.xml
+++ b/app/src/main/res/values/exam.xml
@@ -5,7 +5,7 @@
     <string name="dia_profile">You should set the value for DIA in your profile.</string>
     <string name="dia_minimumis5h">The minimum allowed value is 5 hours.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
-    <string name="dia_meaningisequaltodiapump">If you are satisfied that the value for DIA that you used in your pump prior to AndroidAPS worked well, there is no need to change this when you start looping..</string>
+    <string name="dia_meaningisequaltodiapump">If you are satisfied that the value for DIA that you used in your pump prior to AndroidAPS worked well, there is no need to change this when you start looping.</string>
     <string name="dia_valuemustbedetermined">You should determine for yourself the appropriate value for DIA.</string>
     <string name="hypott_label">Topic 6: Hypo Temp-Target</string>
     <string name="hypott_whenhypott">What is primary reason to set a hypo  temp target?</string>
@@ -33,7 +33,7 @@
     <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="objectives2_maintenance">Export your settings locally using the maintenance menu.</string>
-    <string name="objectives2_internalstorage">Your settings file is found in the folder Internal Storage/AndroidAPS/preferences on your phone.</string>
+    <string name="objectives2_internalstorage">Your settings file is found in the folder Internal Storage/AAPS/preferences on your phone.</string>
     <string name="objectives2_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="objectives2_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>
@@ -48,9 +48,9 @@
     <string name="noisycgm_checksmoothing">Verify that your CGM app smoothes BG data.</string>
     <string name="exerciseprofile_label">Topic 8: Exercise and Profiles</string>
     <string name="exerciseprofile_whattodo">How can you use profiles to best help the system deal with aerobic exercise?</string>
-    <string name="exerciseprofile_switchprofilebelow100">Do a profile switch to more than 100%.</string>
-    <string name="exerciseprofile_switchprofileabove100">Do a profile switch to less than 100%. </string>
-    <string name="exercisprofilee_leaveat100">Leave the profile set to 100%.</string>
+    <string name="exerciseprofile_switchprofilebelow100">Do a profile switch to less than 100%.</string>
+    <string name="exerciseprofile_switchprofileabove100">Do a profile switch to more than 100%. </string>
+    <string name="exerciseprofile_leaveat100">Leave the profile set to 100%.</string>
     <string name="exerciseprofile_suspendloop">Suspend the loop.</string>
     <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
     <string name="exercise_label">Topic 9: Exercise and Temporary Targets</string>
@@ -64,7 +64,7 @@
     <string name="suspendloop_doigetinsulin">Do I receive insulin when the loop is disabled/suspended?</string>
     <string name="suspendloop_yes">Yes, basal insulin continues to be delivered.</string>
     <string name="suspendloop_no">No, delivery of insulin is stopped.</string>
-    <string name="basaltest_label">Topic 2: Basal, ISF, and IC Testing</string>
+    <string name="basaltest_label">Topic 2: Basal, ISF, and I:C Testing</string>
     <string name="basaltest_when">When should these values be validated?</string>
     <string name="basaltest_beforeloop">Before starting looping.</string>
     <string name="basaltest_havingregularhighlow">When experiencing frequent high or low blood glucose.</string>
@@ -152,7 +152,7 @@
     <string name="nsclient_label">Topic 20: Remote Monitoring</string>
     <string name="nsclient_howcanyou">How can you monitor AndroidAPS (for example for your child) remotely?</string>
     <string name="nsclient_nightscout">NS Client app, Nightscout app and Nightscout webpage all allow you to follow AndroidAPS remotely.</string>
-    <string name="nsclient_dexcomfollow">Other apps (e.g. Dexcom follow, xDrip running in follow mode) allow you to follow some parameters (e.g. blood glucose/sensor values) remotely, but use different algorithms so may have inaccurate IOB or COB values..</string>
+    <string name="nsclient_dexcomfollow">Other apps (e.g. Dexcom follow, xDrip running in follow mode) allow you to follow some parameters (e.g. blood glucose/sensor values) remotely, but use different algorithms so may have inaccurate IOB or COB values.</string>
     <string name="nsclient_data">To follow AndroidAPS remotely, both devices must have internet access (e.g. via Wi-Fi or mobile/cellular network data).</string>
     <string name="nsclient_fullcontrol">NS Client used as a remote follower will both monitor and provide full control of AndroidAPS.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>

From 9546d9adef78ffe8c51997de3ba86ff4d2b0e317 Mon Sep 17 00:00:00 2001
From: Matthew Gray <mattnc30@hotmail.com>
Date: Tue, 3 Nov 2020 13:37:31 +0000
Subject: [PATCH 17/26] Group RC1.

---
 .../plugins/constraints/objectives/objectives/Objective2.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 89e80a66e2..a55e871cea 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
@@ -170,7 +170,7 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.wronginsulin_prime, true))
                 .option(new Option(R.string.wrongcarbs_donothing, false))
         );
-        tasks.add(new ExamTask(R.string.iob_label, R.string.iob_which,"iob")
+        tasks.add(new ExamTask(R.string.iob_label, R.string.blank,"iob")
                 .option(new Option(R.string.iob_deviation, true))
                 .option(new Option(R.string.iob_hightemp, false))
                 .option(new Option(R.string.iob_negiob, true))

From 865264fc3c4d8108da3b645dceb790ac64b35792 Mon Sep 17 00:00:00 2001
From: Matthew Gray <mattnc30@hotmail.com>
Date: Tue, 17 Nov 2020 14:14:29 +0000
Subject: [PATCH 18/26] Group RC2.

---
 .../objectives/objectives/Objective2.java      | 18 ++++++++++++------
 app/src/main/res/values/exam.xml               |  5 +++++
 2 files changed, 17 insertions(+), 6 deletions(-)

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 a55e871cea..3530d94c89 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
@@ -52,7 +52,6 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.isf_preferences, false))
                 .option(new Option(R.string.isf_increasingvalue, false))
                 .option(new Option(R.string.isf_noeffect, false))
-                .option(new Option(R.string.isf_profile, false))
                 .hint(new Hint(R.string.isf_hint1))
                 .hint(new Hint(R.string.isf_hint2))
         );
@@ -78,11 +77,11 @@ public class Objective2 extends Objective {
                 .hint(new Hint(R.string.profileswitch_hint1))
         );
         tasks.add(new ExamTask(R.string.profileswitch2_label, R.string.profileswitch2_pctwillchange,"profileswitch2")
-                        .option(new Option(R.string.profileswitch2_bghigher, false))
-                        .option(new Option(R.string.profileswitch2_basalhigher, true))
-                        .option(new Option(R.string.profileswitch2_bgunchanged, true))
-                        .option(new Option(R.string.profileswitch2_isfhigher, false))
-                        .hint(new Hint(R.string.profileswitch_hint1))
+                .option(new Option(R.string.profileswitch2_bghigher, false))
+                .option(new Option(R.string.profileswitch2_basalhigher, true))
+                .option(new Option(R.string.profileswitch2_bgunchanged, true))
+                .option(new Option(R.string.profileswitch2_isfhigher, false))
+                .hint(new Hint(R.string.profileswitch_hint1))
         );
         tasks.add(new ExamTask(R.string.profileswitchtime_label, R.string.profileswitchtime_iwant,"profileswitchtime")
                 .option(new Option(R.string.profileswitchtime_2, false))
@@ -91,6 +90,13 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.profileswitchtime_100, false))
                 .hint(new Hint(R.string.profileswitchtime_hint1))
         );
+        tasks.add(new ExamTask(R.string.profileswitch4_label, R.string.blank,"profileswitch4")
+                .option(new Option(R.string.profileswitch4_rates, true))
+                .option(new Option(R.string.profileswitch4_internet, true))
+                .option(new Option(R.string.profileswitch4_sufficient, false))
+                .option(new Option(R.string.profileswitch4_multi, true))
+                .hint(new Hint(R.string.profileswitch_hint1))
+        );
         tasks.add(new ExamTask(R.string.exerciseprofile_label, R.string.exerciseprofile_whattodo,"exercise")
                 .option(new Option(R.string.exerciseprofile_switchprofileabove100, false))
                 .option(new Option(R.string.exerciseprofile_switchprofilebelow100, true))
diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml
index ab4e0641bd..94dfc3ccdb 100644
--- a/app/src/main/res/values/exam.xml
+++ b/app/src/main/res/values/exam.xml
@@ -190,6 +190,11 @@
     <string name="profileswitchtime_tt">Set an eating soon temporary target.</string>
     <string name="profileswitchtime_100">Do a profile switch to more than 100%. </string>
     <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
+    <string name="profileswitch4_label">Topic 7: Changes to profiles</string>
+    <string name="profileswitch4_rates">Basal rates, ISF, I:C ratios, etc., should be set in profiles.</string>
+    <string name="profileswitch4_internet">Activating changes to your Nightscout Profile requires your AndroidAPS phone to have an internet connection.</string>
+    <string name="profileswitch4_sufficient">Editing profiles to change values is sufficient to enact any changes made.</string>
+    <string name="profileswitch4_multi">Multiple profiles can be set up and selected to accommodate changing circumstances (e.g. hormonal changes, shift working, weekdays/weekend lifestyle).</string>
     <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
     <string name="basalhelp_label">Topic: Help with basal rates</string>
     <string name="basalhelp_where">Where to go for help with basalrate etc.</string>

From 80ed5907398bff2c68e909b64795c67649f951bf Mon Sep 17 00:00:00 2001
From: Matthew Gray <mattnc30@hotmail.com>
Date: Fri, 27 Nov 2020 15:04:43 +0000
Subject: [PATCH 19/26] RC3 - renumbered.

---
 app/src/main/res/values/exam.xml | 48 ++++++++++++++++----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml
index 94dfc3ccdb..60b4c58e13 100644
--- a/app/src/main/res/values/exam.xml
+++ b/app/src/main/res/values/exam.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">What is true about DIA?</string>
-    <string name="dia_label_exam">Topic 3: Duration of Insulin Action (DIA)</string>
+    <string name="dia_label_exam">Question 4: Duration of Insulin Action (DIA)</string>
     <string name="dia_profile">You should set the value for DIA in your profile.</string>
     <string name="dia_minimumis5h">The minimum allowed value is 5 hours.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
     <string name="dia_meaningisequaltodiapump">If you are satisfied that the value for DIA that you used in your pump prior to AndroidAPS worked well, there is no need to change this when you start looping.</string>
     <string name="dia_valuemustbedetermined">You should determine for yourself the appropriate value for DIA.</string>
-    <string name="hypott_label">Topic 6: Hypo Temp-Target</string>
+    <string name="hypott_label">Question 7: Hypo Temp-Target</string>
     <string name="hypott_whenhypott">What is primary reason to set a hypo  temp target?</string>
     <string name="hypott_wrongbasal">To correct for hypos caused by incorrect basal rate settings.</string>
     <string name="hypott_preventoversmb">To prevent AndroidAPS from overcorrecting for a blood glucose rise caused by the fast acting carbs used to treat a hypo.</string>
@@ -18,15 +18,15 @@
     <string name="offlineprofile_label">Topic: Offline Profile</string>
     <string name="offlineprofile_nsprofile">NS Profile can be used, but not configured.</string>
     <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
-    <string name="pumpdisconnect_label">Topic 10: Reasons for applying "Disconnect pump" in AndroidAPS</string>
+    <string name="pumpdisconnect_label">Question 13: Reasons for applying "Disconnect pump" in AndroidAPS</string>
     <string name="pumpdisconnect_whattodo">What should be done when disconnecting the pump?</string>
     <string name="pumpdisconnect_unnecessary">This is unnecessary as insulin will not be delivered if the pump is physically disconnected.</string>
     <string name="pumpdisconnect_missinginsulin">It prevents AndroidAPS from accounting for insulin that was not delivered whilst the pump is physically disconnected. </string>
     <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 13: AndroidAPS Settings</string>
-    <string name="objectives2_label">Topic 13: More AndroidAPS Settings</string>
+    <string name="objectives_label">Question 16: AndroidAPS Settings</string>
+    <string name="objectives2_label">Question 17: 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>
@@ -53,7 +53,7 @@
     <string name="exerciseprofile_leaveat100">Leave the profile set to 100%.</string>
     <string name="exerciseprofile_suspendloop">Suspend the loop.</string>
     <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
-    <string name="exercise_label">Topic 9: Exercise and Temporary Targets</string>
+    <string name="exercise_label">Question 12: Exercise and Temporary Targets</string>
     <string name="exercise_whattodo">How can you use temporary targets to best help the system deal with aerobic exercise?</string>
     <string name="exercise_settt">Set an activity blood glucose target starting a suitable time before beginning exercise.</string>
     <string name="exercise_setfinished">Set an activity blood glucose target after finishing exercise.</string>
@@ -64,14 +64,14 @@
     <string name="suspendloop_doigetinsulin">Do I receive insulin when the loop is disabled/suspended?</string>
     <string name="suspendloop_yes">Yes, basal insulin continues to be delivered.</string>
     <string name="suspendloop_no">No, delivery of insulin is stopped.</string>
-    <string name="basaltest_label">Topic 2: Basal, ISF, and I:C Testing</string>
+    <string name="basaltest_label">Question 3: Basal, ISF, and I:C Testing</string>
     <string name="basaltest_when">When should these values be validated?</string>
     <string name="basaltest_beforeloop">Before starting looping.</string>
     <string name="basaltest_havingregularhighlow">When experiencing frequent high or low blood glucose.</string>
     <string name="basaltest_weekly">At least once per week.</string>
     <string name="basaltest_fixed">Once set and validated, these values should not change over time.</string>
     <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
-    <string name="prerequisites_label">Topic 1: Prerequisites</string>
+    <string name="prerequisites_label">Question 1: Prerequisites</string>
     <string name="prerequisites_what">What is essential to set up and use AndroidAPS?</string>
     <string name="prerequisites_determinedcorrectprofile">Validated profile information (Basal, IC, ISF, DIA).</string>
     <string name="prerequisites_computer">A computer with Android Studio installed and configured.</string>
@@ -86,14 +86,14 @@
     <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
     <string name="prerequisites_smartwatch">A Smartwatch.</string>
     <string name="prerequisites_supportedcgm">A Supported CGM.</string>
-    <string name="prerequisites2_label">Topic 1: More Prerequisites</string>
+    <string name="prerequisites2_label">Question 2: Prerequisites</string>
     <string name="prerequisites2_what">What is essential to set up and use AndroidAPS?</string>
     <string name="prerequisites2_profile">Validated information to set up a profile (ISF, I:C ratio, basal rates, DIA etc.).</string>
     <string name="prerequisites2_device">A compatible Android device (e.g. mobile/cell phone, full Android watch, or tablet).</string>
     <string name="prerequisites2_internet">AndroidAPS requires an internet connection in order to run in closed loop.</string>
     <string name="prerequisites2_supportedcgm">A supported CGM and appropriate app to receive blood glucose values on the phone/device.</string>
     <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
-    <string name="update_label">Topic 14: Updating AndroidAPS</string>
+    <string name="update_label">Question 18: Updating AndroidAPS</string>
     <string name="whatistrue">Check all correct answers.</string>
     <string name="update_git">You need to have Git installed and configured on your computer.</string>
     <string name="update_asap">When updated versions of AndroidAPS are released, the earlier versions may be remotely limited after a specified time.</string>
@@ -101,7 +101,7 @@
     <string name="update_neverupdate">Never update if the system is working well.</string>
     <string name="update_askfriend">If you have difficulty building the apk, you can install an apk that has been built by a friend.</string>
     <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
-    <string name="troubleshooting_label">Topic 15: Troubleshooting</string>
+    <string name="troubleshooting_label">Question 19: Troubleshooting</string>
     <string name="troubleshooting_wheretoask">Where can you look for help with AndroidAPS?</string>
     <string name="troubleshooting_fb">You can ask for advice in the AndroidAPS Users Facebook group.</string>
     <string name="troubleshooting_wiki">You should read (and re-read) the AndroidAPS documentation.</string>
@@ -110,14 +110,14 @@
     <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting</string>
     <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
     <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
-    <string name="insulin_label">Topic 11: Insulin Plugins</string>
+    <string name="insulin_label">Question 14: Insulin Plugins</string>
     <string name="insulin_ultrarapid">Which insulin should you use with the Ultra-Rapid Oref plugin?</string>
     <string name="insulin_fiasp">Fiasp®</string>
     <string name="insulin_novorapid">NovoRapid®/Novolog®</string>
     <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 12: Sensitivity Plugins</string>
+    <string name="sensitivity_label">Question 15: 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>
@@ -130,33 +130,33 @@
     <string name="wrongcarbs_addinsulin">Bolus with insulin using the Insulin (bolus) button in Overview. </string>
     <string name="wrongcarbs_donothing">Do nothing – AndroidAPS will make the appropriate adjustments.</string>
     <string name="wrongcarbs_bolus">Bolus with insulin using the Insulin (bolus) button in Overview.</string>
-    <string name="wronginsulin_label">Topic 17: Insulin delivery/entry errors</string>
+    <string name="wronginsulin_label">Question 20: Insulin delivery/entry errors</string>
     <string name="wronginsulin_whattodo">What should you do if you received less insulin than the pump history suggests e.g. due to an occlusion, a failed cannula or forgetting to reattach the pump after a shower? </string>
     <string name="wronginsulin_careportal">Delete insulin data from Nightscout Careportal to remove it from the pump history.</string>
     <string name="wronginsulin_bolus">Bolus the missing insulin using the Insulin button in Overview.</string>
     <string name="wronginsulin_prime">Bolus a proportion of your calculated ‘missed’ insulin by either syringe/pen or using a prime.</string>
     <string name="wronginsulin_donothing">Do nothing and allow AndroidAPS to correct any resulting high blood glucose level.</string>
-    <string name="iob_label">Topic 18: Insulin on Board (IOB)</string>
+    <string name="iob_label">Question 21: Insulin on Board (IOB)</string>
     <string name="iob_which">Check all the correct answers.</string>
     <string name="iob_deviation">IOB describes the current deviation from expected insulin required based on your profile and settings.</string>
     <string name="iob_hightemp">High temp basal will not be given when your blood sugar is below target.</string>
     <string name="iob_negiob">Negative IOB for a substantial period in the absence of exercise suggests your profile is too strong and less insulin is needed in your settings.</string>
     <string name="iob_posiob">Positive IOB for a substantial period suggests insulin resistance or unannounced meals.</string>
-    <string name="extendedcarbs_label">Topic 19: e-carbs</string>
+    <string name="extendedcarbs_label">Question 22: e-carbs</string>
     <string name="extendedcarbs_handling">What could you use e-carbs (extended carbs) for?</string>
     <string name="extendedcarbs_future">To schedule carbs in the future, possibly distributed over an interval (similar to an extended bolus distributing insulin over an interval).</string>
     <string name="extendedcarbs_free">For logging \'free\' exercise carbs you want to hide from AndroidAPS.</string>
     <string name="extendedcarbs_fat">e-carbs (distributed in the future) can assist AndroidAPS in dealing with high fat/protein meals.</string>
     <string name="extendedcarbs_rescue">For logging rescue carbs you use to treat low blood glucose. </string>
     <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
-    <string name="nsclient_label">Topic 20: Remote Monitoring</string>
+    <string name="nsclient_label">Question 23: Remote Monitoring</string>
     <string name="nsclient_howcanyou">How can you monitor AndroidAPS (for example for your child) remotely?</string>
     <string name="nsclient_nightscout">NS Client app, Nightscout app and Nightscout webpage all allow you to follow AndroidAPS remotely.</string>
     <string name="nsclient_dexcomfollow">Other apps (e.g. Dexcom follow, xDrip running in follow mode) allow you to follow some parameters (e.g. blood glucose/sensor values) remotely, but use different algorithms so may have inaccurate IOB or COB values.</string>
     <string name="nsclient_data">To follow AndroidAPS remotely, both devices must have internet access (e.g. via Wi-Fi or mobile/cellular network data).</string>
     <string name="nsclient_fullcontrol">NS Client used as a remote follower will both monitor and provide full control of AndroidAPS.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
-    <string name="isf_label_exam">Topic 4: Insulin Sensitivity Factor (ISF)</string>
+    <string name="isf_label_exam">Question 5: Insulin Sensitivity Factor (ISF)</string>
     <string name="isf_increasingvalue">Raising ISF values will lead to more insulin delivery to cover a specific amount of carbs.</string>
     <string name="isf_decreasingvalue">Reducing ISF values lead to more insulin delivery to correct for an above target blood glucose.</string>
     <string name="isf_noeffect">Raising or lowering ISF values will not affect the insulin delivery when AndroidAPS corrects for a below-target blood glucose.</string>
@@ -164,33 +164,33 @@
     <string name="isf_profile">Changing the ISF value in your profile is enough to apply the change.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
-    <string name="ic_label_exam">Topic 5: The Insulin to Carbohydrate (I:C) Ratio</string>
+    <string name="ic_label_exam">Question 6: The Insulin to Carbohydrate (I:C) Ratio</string>
     <string name="ic_increasingvalue">When COB is zero, raising I:C ratio will lead to more insulin being delivered to correct an above target blood glucose value.</string>
     <string name="ic_decreasingvalue">Lowering the numerical value of the I:C ratio (so that the value of I:C is smaller) will lead to more insulin being delivered for a specific amount of carbs. </string>
     <string name="ic_multiple">You can use more than one value for I:C ratio in your profile.</string>
     <string name="ic_isf">If you change your ISF in your profile you should always change your I:C ratio too.</string>
     <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
-    <string name="profileswitch_label">Topic 7: Profile Switching 1</string>
+    <string name="profileswitch_label">Question 8: Profile Switching</string>
     <string name="profileswitch_pctwillchange"> When specifying a 90% profile switch, which answers are true?</string>
     <string name="profileswitch_basallower">Basal rates will be 10% lower.</string>
     <string name="profileswitch_isfhigher">ISF will be 10% higher.</string>
     <string name="profileswitch_iclower">I:C ratios will be 10% lower.</string>
     <string name="profileswitch_unchanged">ISF and I:C rations will be unchanged.</string>
     <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
-    <string name="profileswitch2_label">Topic 7: Profile Switching 2</string>
+    <string name="profileswitch2_label">Question 9: Profile Switching</string>
     <string name="profileswitch2_pctwillchange"> When specifying a 120% profile switch, which answers are true?</string>
     <string name="profileswitch2_bghigher">Target blood glucose will be 20% higher.</string>
     <string name="profileswitch2_basalhigher">Basal rates will be 20% higher.</string>
     <string name="profileswitch2_bgunchanged">Target blood glucose will be unchanged.</string>
     <string name="profileswitch2_isfhigher">ISF will be 20% higher.</string>
-    <string name="profileswitchtime_label">Topic 7: Profile Switching 3</string>
+    <string name="profileswitchtime_label">Question 10: Profile Switching</string>
     <string name="profileswitchtime_iwant">If you get up 2 hours earlier than usual, how should you notify AndroidAPS of the change in your schedule?</string>
     <string name="profileswitchtime_2">Initiate a profile switch with a timeshift of 2</string>
     <string name="profileswitchtime__2">Initiate a profile switch with a timeshift of -2</string>
     <string name="profileswitchtime_tt">Set an eating soon temporary target.</string>
     <string name="profileswitchtime_100">Do a profile switch to more than 100%. </string>
     <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
-    <string name="profileswitch4_label">Topic 7: Changes to profiles</string>
+    <string name="profileswitch4_label">Question 11: Changes to profiles</string>
     <string name="profileswitch4_rates">Basal rates, ISF, I:C ratios, etc., should be set in profiles.</string>
     <string name="profileswitch4_internet">Activating changes to your Nightscout Profile requires your AndroidAPS phone to have an internet connection.</string>
     <string name="profileswitch4_sufficient">Editing profiles to change values is sufficient to enact any changes made.</string>
@@ -202,7 +202,7 @@
     <string name="basalhelp_google">Google</string>
     <string name="basalhelp_facebook">Facebook</string>
     <string name="blank"></string>
-    <string name="other_medication_label">Topic 21: Other Medication. Please read the statement below and then check the box to accept the declaration.</string>
+    <string name="other_medication_label">Question 24: Other Medication. Please read the statement below and then check the box to accept the declaration.</string>
     <string name="other_medication_text">AndroidAPS reduces basal rates or suspends insulin delivery to raise blood sugar. Drugs in the class SGLT2 inhibitors (gliflozins) can prevent increases in blood glucose and therefore can produce a dangerous insulin deficiency leading to DKA.
 \nCommon brand names are: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nI hereby promise that I will not take such drugs when using AndroidAPS or will deactivate the loop before using such drugs.</string>
 

From 18e914a50894352cebbe97324d6c4336f0a3903f Mon Sep 17 00:00:00 2001
From: Matthew Gray <mattnc30@hotmail.com>
Date: Fri, 27 Nov 2020 15:19:38 +0000
Subject: [PATCH 20/26] RC4 - renumbered CORRECTLY.

---
 app/src/main/res/values/exam.xml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml
index 60b4c58e13..d54f714801 100644
--- a/app/src/main/res/values/exam.xml
+++ b/app/src/main/res/values/exam.xml
@@ -18,15 +18,15 @@
     <string name="offlineprofile_label">Topic: Offline Profile</string>
     <string name="offlineprofile_nsprofile">NS Profile can be used, but not configured.</string>
     <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
-    <string name="pumpdisconnect_label">Question 13: Reasons for applying "Disconnect pump" in AndroidAPS</string>
+    <string name="pumpdisconnect_label">Question 14: Reasons for applying "Disconnect pump" in AndroidAPS</string>
     <string name="pumpdisconnect_whattodo">What should be done when disconnecting the pump?</string>
     <string name="pumpdisconnect_unnecessary">This is unnecessary as insulin will not be delivered if the pump is physically disconnected.</string>
     <string name="pumpdisconnect_missinginsulin">It prevents AndroidAPS from accounting for insulin that was not delivered whilst the pump is physically disconnected. </string>
     <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">Question 16: AndroidAPS Settings</string>
-    <string name="objectives2_label">Question 17: AndroidAPS Settings</string>
+    <string name="objectives_label">Question 17: AndroidAPS Settings</string>
+    <string name="objectives2_label">Question 18: 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>
@@ -46,14 +46,14 @@
     <string name="noisycgm_turnoffphone">Turn off the phone.</string>
     <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
     <string name="noisycgm_checksmoothing">Verify that your CGM app smoothes BG data.</string>
-    <string name="exerciseprofile_label">Topic 8: Exercise and Profiles</string>
+    <string name="exerciseprofile_label">Question 13: Exercise and Profiles</string>
     <string name="exerciseprofile_whattodo">How can you use profiles to best help the system deal with aerobic exercise?</string>
     <string name="exerciseprofile_switchprofilebelow100">Do a profile switch to less than 100%.</string>
     <string name="exerciseprofile_switchprofileabove100">Do a profile switch to more than 100%. </string>
     <string name="exerciseprofile_leaveat100">Leave the profile set to 100%.</string>
     <string name="exerciseprofile_suspendloop">Suspend the loop.</string>
     <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
-    <string name="exercise_label">Question 12: Exercise and Temporary Targets</string>
+    <string name="exercise_label">Question 14: Exercise and Temporary Targets</string>
     <string name="exercise_whattodo">How can you use temporary targets to best help the system deal with aerobic exercise?</string>
     <string name="exercise_settt">Set an activity blood glucose target starting a suitable time before beginning exercise.</string>
     <string name="exercise_setfinished">Set an activity blood glucose target after finishing exercise.</string>
@@ -93,7 +93,7 @@
     <string name="prerequisites2_internet">AndroidAPS requires an internet connection in order to run in closed loop.</string>
     <string name="prerequisites2_supportedcgm">A supported CGM and appropriate app to receive blood glucose values on the phone/device.</string>
     <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
-    <string name="update_label">Question 18: Updating AndroidAPS</string>
+    <string name="update_label">Question 19: Updating AndroidAPS</string>
     <string name="whatistrue">Check all correct answers.</string>
     <string name="update_git">You need to have Git installed and configured on your computer.</string>
     <string name="update_asap">When updated versions of AndroidAPS are released, the earlier versions may be remotely limited after a specified time.</string>
@@ -101,7 +101,7 @@
     <string name="update_neverupdate">Never update if the system is working well.</string>
     <string name="update_askfriend">If you have difficulty building the apk, you can install an apk that has been built by a friend.</string>
     <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
-    <string name="troubleshooting_label">Question 19: Troubleshooting</string>
+    <string name="troubleshooting_label">Question 20: Troubleshooting</string>
     <string name="troubleshooting_wheretoask">Where can you look for help with AndroidAPS?</string>
     <string name="troubleshooting_fb">You can ask for advice in the AndroidAPS Users Facebook group.</string>
     <string name="troubleshooting_wiki">You should read (and re-read) the AndroidAPS documentation.</string>
@@ -110,46 +110,46 @@
     <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting</string>
     <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
     <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
-    <string name="insulin_label">Question 14: Insulin Plugins</string>
+    <string name="insulin_label">Question 15: Insulin Plugins</string>
     <string name="insulin_ultrarapid">Which insulin should you use with the Ultra-Rapid Oref plugin?</string>
     <string name="insulin_fiasp">Fiasp®</string>
     <string name="insulin_novorapid">NovoRapid®/Novolog®</string>
     <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">Question 15: Sensitivity Plugins</string>
+    <string name="sensitivity_label">Question 16: 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="wrongcarbs_label">Topic 16: Carb Entry Errors</string>
+    <string name="wrongcarbs_label">Question 21: 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>
     <string name="wrongcarbs_addinsulin">Bolus with insulin using the Insulin (bolus) button in Overview. </string>
     <string name="wrongcarbs_donothing">Do nothing – AndroidAPS will make the appropriate adjustments.</string>
     <string name="wrongcarbs_bolus">Bolus with insulin using the Insulin (bolus) button in Overview.</string>
-    <string name="wronginsulin_label">Question 20: Insulin delivery/entry errors</string>
+    <string name="wronginsulin_label">Question 22: Insulin delivery/entry errors</string>
     <string name="wronginsulin_whattodo">What should you do if you received less insulin than the pump history suggests e.g. due to an occlusion, a failed cannula or forgetting to reattach the pump after a shower? </string>
     <string name="wronginsulin_careportal">Delete insulin data from Nightscout Careportal to remove it from the pump history.</string>
     <string name="wronginsulin_bolus">Bolus the missing insulin using the Insulin button in Overview.</string>
     <string name="wronginsulin_prime">Bolus a proportion of your calculated ‘missed’ insulin by either syringe/pen or using a prime.</string>
     <string name="wronginsulin_donothing">Do nothing and allow AndroidAPS to correct any resulting high blood glucose level.</string>
-    <string name="iob_label">Question 21: Insulin on Board (IOB)</string>
+    <string name="iob_label">Question 23: Insulin on Board (IOB)</string>
     <string name="iob_which">Check all the correct answers.</string>
     <string name="iob_deviation">IOB describes the current deviation from expected insulin required based on your profile and settings.</string>
     <string name="iob_hightemp">High temp basal will not be given when your blood sugar is below target.</string>
     <string name="iob_negiob">Negative IOB for a substantial period in the absence of exercise suggests your profile is too strong and less insulin is needed in your settings.</string>
     <string name="iob_posiob">Positive IOB for a substantial period suggests insulin resistance or unannounced meals.</string>
-    <string name="extendedcarbs_label">Question 22: e-carbs</string>
+    <string name="extendedcarbs_label">Question 24: e-carbs</string>
     <string name="extendedcarbs_handling">What could you use e-carbs (extended carbs) for?</string>
     <string name="extendedcarbs_future">To schedule carbs in the future, possibly distributed over an interval (similar to an extended bolus distributing insulin over an interval).</string>
     <string name="extendedcarbs_free">For logging \'free\' exercise carbs you want to hide from AndroidAPS.</string>
     <string name="extendedcarbs_fat">e-carbs (distributed in the future) can assist AndroidAPS in dealing with high fat/protein meals.</string>
     <string name="extendedcarbs_rescue">For logging rescue carbs you use to treat low blood glucose. </string>
     <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
-    <string name="nsclient_label">Question 23: Remote Monitoring</string>
+    <string name="nsclient_label">Question 25: Remote Monitoring</string>
     <string name="nsclient_howcanyou">How can you monitor AndroidAPS (for example for your child) remotely?</string>
     <string name="nsclient_nightscout">NS Client app, Nightscout app and Nightscout webpage all allow you to follow AndroidAPS remotely.</string>
     <string name="nsclient_dexcomfollow">Other apps (e.g. Dexcom follow, xDrip running in follow mode) allow you to follow some parameters (e.g. blood glucose/sensor values) remotely, but use different algorithms so may have inaccurate IOB or COB values.</string>
@@ -202,7 +202,7 @@
     <string name="basalhelp_google">Google</string>
     <string name="basalhelp_facebook">Facebook</string>
     <string name="blank"></string>
-    <string name="other_medication_label">Question 24: Other Medication. Please read the statement below and then check the box to accept the declaration.</string>
+    <string name="other_medication_label">Question 26: Other Medication. Please read the statement below and then check the box to accept the declaration.</string>
     <string name="other_medication_text">AndroidAPS reduces basal rates or suspends insulin delivery to raise blood sugar. Drugs in the class SGLT2 inhibitors (gliflozins) can prevent increases in blood glucose and therefore can produce a dangerous insulin deficiency leading to DKA.
 \nCommon brand names are: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nI hereby promise that I will not take such drugs when using AndroidAPS or will deactivate the loop before using such drugs.</string>
 

From a9cfbde37743820a7d3eadd81e063f1e963474e4 Mon Sep 17 00:00:00 2001
From: Matthew Gray <mattnc30@hotmail.com>
Date: Fri, 27 Nov 2020 15:26:22 +0000
Subject: [PATCH 21/26] RC4 - renumbered CORRECTLY v2.

---
 app/src/main/res/values/exam.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml
index d54f714801..be09583ab0 100644
--- a/app/src/main/res/values/exam.xml
+++ b/app/src/main/res/values/exam.xml
@@ -46,14 +46,14 @@
     <string name="noisycgm_turnoffphone">Turn off the phone.</string>
     <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
     <string name="noisycgm_checksmoothing">Verify that your CGM app smoothes BG data.</string>
-    <string name="exerciseprofile_label">Question 13: Exercise and Profiles</string>
+    <string name="exerciseprofile_label">Question 12: Exercise and Profiles</string>
     <string name="exerciseprofile_whattodo">How can you use profiles to best help the system deal with aerobic exercise?</string>
     <string name="exerciseprofile_switchprofilebelow100">Do a profile switch to less than 100%.</string>
     <string name="exerciseprofile_switchprofileabove100">Do a profile switch to more than 100%. </string>
     <string name="exerciseprofile_leaveat100">Leave the profile set to 100%.</string>
     <string name="exerciseprofile_suspendloop">Suspend the loop.</string>
     <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
-    <string name="exercise_label">Question 14: Exercise and Temporary Targets</string>
+    <string name="exercise_label">Question 13: Exercise and Temporary Targets</string>
     <string name="exercise_whattodo">How can you use temporary targets to best help the system deal with aerobic exercise?</string>
     <string name="exercise_settt">Set an activity blood glucose target starting a suitable time before beginning exercise.</string>
     <string name="exercise_setfinished">Set an activity blood glucose target after finishing exercise.</string>

From 8c4b2f20a11442481f84d7572b3c29f55c5da424 Mon Sep 17 00:00:00 2001
From: Matthew Gray <mattnc30@hotmail.com>
Date: Fri, 4 Dec 2020 17:29:07 +0000
Subject: [PATCH 22/26] Removed question numbers. Added noise and bread units
 questions.

---
 .../objectives/objectives/Objective2.java     | 14 ++++
 app/src/main/res/values/exam.xml              | 73 ++++++++++---------
 2 files changed, 53 insertions(+), 34 deletions(-)

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 3530d94c89..298640f43a 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
@@ -111,6 +111,13 @@ 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.noisycgm_label, R.string.noisycgm_whattodo,"noisycgm")
+                .option(new Option(R.string.noisycgm_nothing, false))
+                .option(new Option(R.string.noisycgm_pause, true))
+                .option(new Option(R.string.noisycgm_replacesensor, true))
+                .option(new Option(R.string.noisycgm_checksmoothing, true))
+                .hint(new Hint(R.string.noisycgm_hint1))
+        );
         tasks.add(new ExamTask(R.string.pumpdisconnect_label, R.string.blank,"pumpdisconnect")
                 .option(new Option(R.string.pumpdisconnect_unnecessary, false))
                 .option(new Option(R.string.pumpdisconnect_missinginsulin, true))
@@ -182,6 +189,13 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.iob_negiob, true))
                 .option(new Option(R.string.iob_posiob, true))
         );
+        tasks.add(new ExamTask(R.string.breadgrams_label, R.string.blank,"breadgrams")
+                .option(new Option(R.string.breadgrams_grams, true))
+                .option(new Option(R.string.breadgrams_exchange, false))
+                .option(new Option(R.string.breadgrams_decay, true))
+                .option(new Option(R.string.breadgrams_calc, false))
+                .hint(new Hint(R.string.breadgrams_hint1))
+        );
         tasks.add(new ExamTask(R.string.extendedcarbs_label, R.string.extendedcarbs_handling,"extendedcarbs")
                 .option(new Option(R.string.extendedcarbs_future, true))
                 .option(new Option(R.string.extendedcarbs_free, false))
diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml
index be09583ab0..4a3d68f4ac 100644
--- a/app/src/main/res/values/exam.xml
+++ b/app/src/main/res/values/exam.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">What is true about DIA?</string>
-    <string name="dia_label_exam">Question 4: Duration of Insulin Action (DIA)</string>
+    <string name="dia_label_exam">Duration of Insulin Action (DIA)</string>
     <string name="dia_profile">You should set the value for DIA in your profile.</string>
     <string name="dia_minimumis5h">The minimum allowed value is 5 hours.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
     <string name="dia_meaningisequaltodiapump">If you are satisfied that the value for DIA that you used in your pump prior to AndroidAPS worked well, there is no need to change this when you start looping.</string>
     <string name="dia_valuemustbedetermined">You should determine for yourself the appropriate value for DIA.</string>
-    <string name="hypott_label">Question 7: Hypo Temp-Target</string>
+    <string name="hypott_label">Hypo Temp-Target</string>
     <string name="hypott_whenhypott">What is primary reason to set a hypo  temp target?</string>
     <string name="hypott_wrongbasal">To correct for hypos caused by incorrect basal rate settings.</string>
     <string name="hypott_preventoversmb">To prevent AndroidAPS from overcorrecting for a blood glucose rise caused by the fast acting carbs used to treat a hypo.</string>
@@ -18,15 +18,15 @@
     <string name="offlineprofile_label">Topic: Offline Profile</string>
     <string name="offlineprofile_nsprofile">NS Profile can be used, but not configured.</string>
     <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
-    <string name="pumpdisconnect_label">Question 14: Reasons for applying "Disconnect pump" in AndroidAPS</string>
+    <string name="pumpdisconnect_label">Reasons for applying "Disconnect pump" in AndroidAPS</string>
     <string name="pumpdisconnect_whattodo">What should be done when disconnecting the pump?</string>
     <string name="pumpdisconnect_unnecessary">This is unnecessary as insulin will not be delivered if the pump is physically disconnected.</string>
     <string name="pumpdisconnect_missinginsulin">It prevents AndroidAPS from accounting for insulin that was not delivered whilst the pump is physically disconnected. </string>
     <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">Question 17: AndroidAPS Settings</string>
-    <string name="objectives2_label">Question 18: AndroidAPS Settings</string>
+    <string name="objectives_label">AndroidAPS Settings</string>
+    <string name="objectives2_label">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>
@@ -38,40 +38,39 @@
     <string name="objectives2_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>
+    <string name="noisycgm_label">Noisy CGM Readings</string>
     <string name="noisycgm_whattodo">What should be done if CGM data is noisy?</string>
-    <string name="nothing">Nothing, AAPS will deal with it.</string>
-    <string name="noisycgm_pause">Disable the loop to avoid overdosing.</string>
-    <string name="noisycgm_replacesensor">Replace the CGM sensor.</string>
-    <string name="noisycgm_turnoffphone">Turn off the phone.</string>
+    <string name="noisycgm_nothing">Do nothing - AndroidAPS will deal with it.</string>
+    <string name="noisycgm_pause">Disable the closed loop to avoid possible over- or underdosing.</string>
+    <string name="noisycgm_replacesensor">Replace consistently noisy or inaccurate sensors.</string>
+    <string name="noisycgm_checksmoothing">Verify that your CGM app provides smoothed data.</string>
     <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
-    <string name="noisycgm_checksmoothing">Verify that your CGM app smoothes BG data.</string>
-    <string name="exerciseprofile_label">Question 12: Exercise and Profiles</string>
+    <string name="exerciseprofile_label">Exercise and Profiles</string>
     <string name="exerciseprofile_whattodo">How can you use profiles to best help the system deal with aerobic exercise?</string>
     <string name="exerciseprofile_switchprofilebelow100">Do a profile switch to less than 100%.</string>
     <string name="exerciseprofile_switchprofileabove100">Do a profile switch to more than 100%. </string>
     <string name="exerciseprofile_leaveat100">Leave the profile set to 100%.</string>
     <string name="exerciseprofile_suspendloop">Suspend the loop.</string>
     <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
-    <string name="exercise_label">Question 13: Exercise and Temporary Targets</string>
+    <string name="exercise_label">Exercise and Temporary Targets</string>
     <string name="exercise_whattodo">How can you use temporary targets to best help the system deal with aerobic exercise?</string>
     <string name="exercise_settt">Set an activity blood glucose target starting a suitable time before beginning exercise.</string>
     <string name="exercise_setfinished">Set an activity blood glucose target after finishing exercise.</string>
     <string name="exercise_setunchanged">Leave your blood glucose target unchanged.</string>
     <string name="exercise_15g">Wait until blood glucose drops below your hypo temp target and then eat 15 g of fast acting carbohydrates.</string>
     <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
-    <string name="suspendloop_label">Topic: Disabled/Suspended loop</string>
+    <string name="suspendloop_label">Disabled/Suspended loop</string>
     <string name="suspendloop_doigetinsulin">Do I receive insulin when the loop is disabled/suspended?</string>
     <string name="suspendloop_yes">Yes, basal insulin continues to be delivered.</string>
     <string name="suspendloop_no">No, delivery of insulin is stopped.</string>
-    <string name="basaltest_label">Question 3: Basal, ISF, and I:C Testing</string>
+    <string name="basaltest_label">Basal, ISF, and I:C Testing</string>
     <string name="basaltest_when">When should these values be validated?</string>
     <string name="basaltest_beforeloop">Before starting looping.</string>
     <string name="basaltest_havingregularhighlow">When experiencing frequent high or low blood glucose.</string>
     <string name="basaltest_weekly">At least once per week.</string>
     <string name="basaltest_fixed">Once set and validated, these values should not change over time.</string>
     <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
-    <string name="prerequisites_label">Question 1: Prerequisites</string>
+    <string name="prerequisites_label">Prerequisites</string>
     <string name="prerequisites_what">What is essential to set up and use AndroidAPS?</string>
     <string name="prerequisites_determinedcorrectprofile">Validated profile information (Basal, IC, ISF, DIA).</string>
     <string name="prerequisites_computer">A computer with Android Studio installed and configured.</string>
@@ -86,14 +85,14 @@
     <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
     <string name="prerequisites_smartwatch">A Smartwatch.</string>
     <string name="prerequisites_supportedcgm">A Supported CGM.</string>
-    <string name="prerequisites2_label">Question 2: Prerequisites</string>
+    <string name="prerequisites2_label">Prerequisites</string>
     <string name="prerequisites2_what">What is essential to set up and use AndroidAPS?</string>
     <string name="prerequisites2_profile">Validated information to set up a profile (ISF, I:C ratio, basal rates, DIA etc.).</string>
     <string name="prerequisites2_device">A compatible Android device (e.g. mobile/cell phone, full Android watch, or tablet).</string>
     <string name="prerequisites2_internet">AndroidAPS requires an internet connection in order to run in closed loop.</string>
     <string name="prerequisites2_supportedcgm">A supported CGM and appropriate app to receive blood glucose values on the phone/device.</string>
     <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
-    <string name="update_label">Question 19: Updating AndroidAPS</string>
+    <string name="update_label">Updating AndroidAPS</string>
     <string name="whatistrue">Check all correct answers.</string>
     <string name="update_git">You need to have Git installed and configured on your computer.</string>
     <string name="update_asap">When updated versions of AndroidAPS are released, the earlier versions may be remotely limited after a specified time.</string>
@@ -101,7 +100,7 @@
     <string name="update_neverupdate">Never update if the system is working well.</string>
     <string name="update_askfriend">If you have difficulty building the apk, you can install an apk that has been built by a friend.</string>
     <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
-    <string name="troubleshooting_label">Question 20: Troubleshooting</string>
+    <string name="troubleshooting_label">Troubleshooting</string>
     <string name="troubleshooting_wheretoask">Where can you look for help with AndroidAPS?</string>
     <string name="troubleshooting_fb">You can ask for advice in the AndroidAPS Users Facebook group.</string>
     <string name="troubleshooting_wiki">You should read (and re-read) the AndroidAPS documentation.</string>
@@ -110,53 +109,59 @@
     <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting</string>
     <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
     <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
-    <string name="insulin_label">Question 15: Insulin Plugins</string>
+    <string name="insulin_label">Insulin Plugins</string>
     <string name="insulin_ultrarapid">Which insulin should you use with the Ultra-Rapid Oref plugin?</string>
     <string name="insulin_fiasp">Fiasp®</string>
     <string name="insulin_novorapid">NovoRapid®/Novolog®</string>
     <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">Question 16: Sensitivity Plugins</string>
+    <string name="sensitivity_label">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="wrongcarbs_label">Question 21: Carb Entry Errors</string>
+    <string name="wrongcarbs_label">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>
     <string name="wrongcarbs_addinsulin">Bolus with insulin using the Insulin (bolus) button in Overview. </string>
     <string name="wrongcarbs_donothing">Do nothing – AndroidAPS will make the appropriate adjustments.</string>
     <string name="wrongcarbs_bolus">Bolus with insulin using the Insulin (bolus) button in Overview.</string>
-    <string name="wronginsulin_label">Question 22: Insulin delivery/entry errors</string>
+    <string name="wronginsulin_label">Insulin delivery/entry errors</string>
     <string name="wronginsulin_whattodo">What should you do if you received less insulin than the pump history suggests e.g. due to an occlusion, a failed cannula or forgetting to reattach the pump after a shower? </string>
     <string name="wronginsulin_careportal">Delete insulin data from Nightscout Careportal to remove it from the pump history.</string>
     <string name="wronginsulin_bolus">Bolus the missing insulin using the Insulin button in Overview.</string>
     <string name="wronginsulin_prime">Bolus a proportion of your calculated ‘missed’ insulin by either syringe/pen or using a prime.</string>
     <string name="wronginsulin_donothing">Do nothing and allow AndroidAPS to correct any resulting high blood glucose level.</string>
-    <string name="iob_label">Question 23: Insulin on Board (IOB)</string>
+    <string name="iob_label">Insulin on Board (IOB)</string>
     <string name="iob_which">Check all the correct answers.</string>
     <string name="iob_deviation">IOB describes the current deviation from expected insulin required based on your profile and settings.</string>
     <string name="iob_hightemp">High temp basal will not be given when your blood sugar is below target.</string>
     <string name="iob_negiob">Negative IOB for a substantial period in the absence of exercise suggests your profile is too strong and less insulin is needed in your settings.</string>
     <string name="iob_posiob">Positive IOB for a substantial period suggests insulin resistance or unannounced meals.</string>
-    <string name="extendedcarbs_label">Question 24: e-carbs</string>
+    <string name="breadgrams_label">Carb entry and boluses</string>
+    <string name="breadgrams_grams">Only grams should be uesd for estimating and recording carbohydrates consumed.</string>
+    <string name="breadgrams_exchange">Carbohydrates consumed can be recorded using an appropriate exchange system (e.g. DAFNE “CHO” exchanges or European “Bread Units”) provided the appropriate I:C ratios are specified in profiles. </string>
+    <string name="breadgrams_decay">AndroidAPS uses a dynamic model to estimate carb “decay” and calculate COB.</string>
+    <string name="breadgrams_calc">If blood glucose levels are outside acceptable values (too low or too high) the bolus calculator should be used to provide suggestions for carb or insulin corrections.</string>
+    <string name="breadgrams_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-to-carb-ratio-ic-g-u</string>
+    <string name="extendedcarbs_label">e-carbs</string>
     <string name="extendedcarbs_handling">What could you use e-carbs (extended carbs) for?</string>
     <string name="extendedcarbs_future">To schedule carbs in the future, possibly distributed over an interval (similar to an extended bolus distributing insulin over an interval).</string>
     <string name="extendedcarbs_free">For logging \'free\' exercise carbs you want to hide from AndroidAPS.</string>
     <string name="extendedcarbs_fat">e-carbs (distributed in the future) can assist AndroidAPS in dealing with high fat/protein meals.</string>
     <string name="extendedcarbs_rescue">For logging rescue carbs you use to treat low blood glucose. </string>
     <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
-    <string name="nsclient_label">Question 25: Remote Monitoring</string>
+    <string name="nsclient_label">Remote Monitoring</string>
     <string name="nsclient_howcanyou">How can you monitor AndroidAPS (for example for your child) remotely?</string>
     <string name="nsclient_nightscout">NS Client app, Nightscout app and Nightscout webpage all allow you to follow AndroidAPS remotely.</string>
     <string name="nsclient_dexcomfollow">Other apps (e.g. Dexcom follow, xDrip running in follow mode) allow you to follow some parameters (e.g. blood glucose/sensor values) remotely, but use different algorithms so may have inaccurate IOB or COB values.</string>
     <string name="nsclient_data">To follow AndroidAPS remotely, both devices must have internet access (e.g. via Wi-Fi or mobile/cellular network data).</string>
     <string name="nsclient_fullcontrol">NS Client used as a remote follower will both monitor and provide full control of AndroidAPS.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
-    <string name="isf_label_exam">Question 5: Insulin Sensitivity Factor (ISF)</string>
+    <string name="isf_label_exam">Insulin Sensitivity Factor (ISF)</string>
     <string name="isf_increasingvalue">Raising ISF values will lead to more insulin delivery to cover a specific amount of carbs.</string>
     <string name="isf_decreasingvalue">Reducing ISF values lead to more insulin delivery to correct for an above target blood glucose.</string>
     <string name="isf_noeffect">Raising or lowering ISF values will not affect the insulin delivery when AndroidAPS corrects for a below-target blood glucose.</string>
@@ -164,45 +169,45 @@
     <string name="isf_profile">Changing the ISF value in your profile is enough to apply the change.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
-    <string name="ic_label_exam">Question 6: The Insulin to Carbohydrate (I:C) Ratio</string>
+    <string name="ic_label_exam">The Insulin to Carbohydrate (I:C) Ratio</string>
     <string name="ic_increasingvalue">When COB is zero, raising I:C ratio will lead to more insulin being delivered to correct an above target blood glucose value.</string>
     <string name="ic_decreasingvalue">Lowering the numerical value of the I:C ratio (so that the value of I:C is smaller) will lead to more insulin being delivered for a specific amount of carbs. </string>
     <string name="ic_multiple">You can use more than one value for I:C ratio in your profile.</string>
     <string name="ic_isf">If you change your ISF in your profile you should always change your I:C ratio too.</string>
     <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
-    <string name="profileswitch_label">Question 8: Profile Switching</string>
+    <string name="profileswitch_label">Profile Switching</string>
     <string name="profileswitch_pctwillchange"> When specifying a 90% profile switch, which answers are true?</string>
     <string name="profileswitch_basallower">Basal rates will be 10% lower.</string>
     <string name="profileswitch_isfhigher">ISF will be 10% higher.</string>
     <string name="profileswitch_iclower">I:C ratios will be 10% lower.</string>
     <string name="profileswitch_unchanged">ISF and I:C rations will be unchanged.</string>
     <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
-    <string name="profileswitch2_label">Question 9: Profile Switching</string>
+    <string name="profileswitch2_label">Profile Switching</string>
     <string name="profileswitch2_pctwillchange"> When specifying a 120% profile switch, which answers are true?</string>
     <string name="profileswitch2_bghigher">Target blood glucose will be 20% higher.</string>
     <string name="profileswitch2_basalhigher">Basal rates will be 20% higher.</string>
     <string name="profileswitch2_bgunchanged">Target blood glucose will be unchanged.</string>
     <string name="profileswitch2_isfhigher">ISF will be 20% higher.</string>
-    <string name="profileswitchtime_label">Question 10: Profile Switching</string>
+    <string name="profileswitchtime_label">Profile Switching</string>
     <string name="profileswitchtime_iwant">If you get up 2 hours earlier than usual, how should you notify AndroidAPS of the change in your schedule?</string>
     <string name="profileswitchtime_2">Initiate a profile switch with a timeshift of 2</string>
     <string name="profileswitchtime__2">Initiate a profile switch with a timeshift of -2</string>
     <string name="profileswitchtime_tt">Set an eating soon temporary target.</string>
     <string name="profileswitchtime_100">Do a profile switch to more than 100%. </string>
     <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
-    <string name="profileswitch4_label">Question 11: Changes to profiles</string>
+    <string name="profileswitch4_label">Changes to profiles</string>
     <string name="profileswitch4_rates">Basal rates, ISF, I:C ratios, etc., should be set in profiles.</string>
     <string name="profileswitch4_internet">Activating changes to your Nightscout Profile requires your AndroidAPS phone to have an internet connection.</string>
     <string name="profileswitch4_sufficient">Editing profiles to change values is sufficient to enact any changes made.</string>
     <string name="profileswitch4_multi">Multiple profiles can be set up and selected to accommodate changing circumstances (e.g. hormonal changes, shift working, weekdays/weekend lifestyle).</string>
     <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
-    <string name="basalhelp_label">Topic: Help with basal rates</string>
+    <string name="basalhelp_label">Help with basal rates</string>
     <string name="basalhelp_where">Where to go for help with basalrate etc.</string>
     <string name="basalhelp_diabetesteam">Your diabetes team</string>
     <string name="basalhelp_google">Google</string>
     <string name="basalhelp_facebook">Facebook</string>
     <string name="blank"></string>
-    <string name="other_medication_label">Question 26: Other Medication. Please read the statement below and then check the box to accept the declaration.</string>
+    <string name="other_medication_label">Other Medication. Please read the statement below and then check the box to accept the declaration.</string>
     <string name="other_medication_text">AndroidAPS reduces basal rates or suspends insulin delivery to raise blood sugar. Drugs in the class SGLT2 inhibitors (gliflozins) can prevent increases in blood glucose and therefore can produce a dangerous insulin deficiency leading to DKA.
 \nCommon brand names are: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nI hereby promise that I will not take such drugs when using AndroidAPS or will deactivate the loop before using such drugs.</string>
 

From 6ed325f179097c58b5c1c47d7eeb2eed51087071 Mon Sep 17 00:00:00 2001
From: Matthew Gray <mattnc30@hotmail.com>
Date: Fri, 4 Dec 2020 17:44:03 +0000
Subject: [PATCH 23/26] Found 1 typo...

---
 app/src/main/res/values/exam.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml
index 4a3d68f4ac..69d1a62a94 100644
--- a/app/src/main/res/values/exam.xml
+++ b/app/src/main/res/values/exam.xml
@@ -142,7 +142,7 @@
     <string name="iob_negiob">Negative IOB for a substantial period in the absence of exercise suggests your profile is too strong and less insulin is needed in your settings.</string>
     <string name="iob_posiob">Positive IOB for a substantial period suggests insulin resistance or unannounced meals.</string>
     <string name="breadgrams_label">Carb entry and boluses</string>
-    <string name="breadgrams_grams">Only grams should be uesd for estimating and recording carbohydrates consumed.</string>
+    <string name="breadgrams_grams">Only grams should be used for estimating and recording carbohydrates consumed.</string>
     <string name="breadgrams_exchange">Carbohydrates consumed can be recorded using an appropriate exchange system (e.g. DAFNE “CHO” exchanges or European “Bread Units”) provided the appropriate I:C ratios are specified in profiles. </string>
     <string name="breadgrams_decay">AndroidAPS uses a dynamic model to estimate carb “decay” and calculate COB.</string>
     <string name="breadgrams_calc">If blood glucose levels are outside acceptable values (too low or too high) the bolus calculator should be used to provide suggestions for carb or insulin corrections.</string>

From d18d17c2741fdb49f4308a3ca7a1a5dcba0b3d40 Mon Sep 17 00:00:00 2001
From: Matthew Gray <mattnc30@hotmail.com>
Date: Mon, 7 Dec 2020 16:03:45 +0000
Subject: [PATCH 24/26] CHO/Bread units changed.

---
 app/src/main/res/values/exam.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml
index 69d1a62a94..fb43c28f0b 100644
--- a/app/src/main/res/values/exam.xml
+++ b/app/src/main/res/values/exam.xml
@@ -143,7 +143,7 @@
     <string name="iob_posiob">Positive IOB for a substantial period suggests insulin resistance or unannounced meals.</string>
     <string name="breadgrams_label">Carb entry and boluses</string>
     <string name="breadgrams_grams">Only grams should be used for estimating and recording carbohydrates consumed.</string>
-    <string name="breadgrams_exchange">Carbohydrates consumed can be recorded using an appropriate exchange system (e.g. DAFNE “CHO” exchanges or European “Bread Units”) provided the appropriate I:C ratios are specified in profiles. </string>
+    <string name="breadgrams_exchange">DAFNE "CHO" exchanges or European "Bread Units" are acceptable provided the appropriate I:C ratios are specified in profiles.</string>
     <string name="breadgrams_decay">AndroidAPS uses a dynamic model to estimate carb “decay” and calculate COB.</string>
     <string name="breadgrams_calc">If blood glucose levels are outside acceptable values (too low or too high) the bolus calculator should be used to provide suggestions for carb or insulin corrections.</string>
     <string name="breadgrams_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-to-carb-ratio-ic-g-u</string>

From fa7cab936517be02977499029df47d3f95a69812 Mon Sep 17 00:00:00 2001
From: Matthew Gray <mattnc30@hotmail.com>
Date: Mon, 14 Dec 2020 13:15:04 +0000
Subject: [PATCH 25/26] Open topics: 1) Typo in Hypo Temp Target - FIXED. 2)
 Profile switching I:C answer (negate text or expected answer) - FIXED. 3)
 Douplicated copy in wrongcarbs - FIXED. 4) Possible other strategy in insulin
 delivery/entry errors. - FIXED.

---
 .../constraints/objectives/objectives/Objective2.java  |  2 +-
 app/src/main/res/values/exam.xml                       | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

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 298640f43a..504b51e21a 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
@@ -72,7 +72,7 @@ public class Objective2 extends Objective {
         tasks.add(new ExamTask(R.string.profileswitch_label, R.string.profileswitch_pctwillchange,"profileswitch")
                 .option(new Option(R.string.profileswitch_basallower, true))
                 .option(new Option(R.string.profileswitch_isfhigher, true))
-                .option(new Option(R.string.profileswitch_iclower, true))
+                .option(new Option(R.string.profileswitch_iclower, false))
                 .option(new Option(R.string.profileswitch_unchanged, false))
                 .hint(new Hint(R.string.profileswitch_hint1))
         );
diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml
index fb43c28f0b..11bc1b4f26 100644
--- a/app/src/main/res/values/exam.xml
+++ b/app/src/main/res/values/exam.xml
@@ -12,7 +12,7 @@
     <string name="hypott_wrongbasal">To correct for hypos caused by incorrect basal rate settings.</string>
     <string name="hypott_preventoversmb">To prevent AndroidAPS from overcorrecting for a blood glucose rise caused by the fast acting carbs used to treat a hypo.</string>
     <string name="hypott_exercise">To correct for a hypo induced as a result of exercise.</string>
-    <string name="hypott_0basal">To prevent blood glucose from going low of there is already a 0% temporary basal rate running.</string>
+    <string name="hypott_0basal">To prevent blood glucose from going low if there is already a 0% temporary basal rate running.</string>
     <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html</string>
     <string name="offlineprofile_whatprofile">Which profile can be used and configured offline?</string>
     <string name="offlineprofile_label">Topic: Offline Profile</string>
@@ -126,7 +126,7 @@
     <string name="wrongcarbs_label">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>
-    <string name="wrongcarbs_addinsulin">Bolus with insulin using the Insulin (bolus) button in Overview. </string>
+    <string name="wrongcarbs_addinsulin">Bolus with insulin using the infusion set prime menu.</string>
     <string name="wrongcarbs_donothing">Do nothing – AndroidAPS will make the appropriate adjustments.</string>
     <string name="wrongcarbs_bolus">Bolus with insulin using the Insulin (bolus) button in Overview.</string>
     <string name="wronginsulin_label">Insulin delivery/entry errors</string>
@@ -143,7 +143,7 @@
     <string name="iob_posiob">Positive IOB for a substantial period suggests insulin resistance or unannounced meals.</string>
     <string name="breadgrams_label">Carb entry and boluses</string>
     <string name="breadgrams_grams">Only grams should be used for estimating and recording carbohydrates consumed.</string>
-    <string name="breadgrams_exchange">DAFNE "CHO" exchanges or European "Bread Units" are acceptable provided the appropriate I:C ratios are specified in profiles.</string>
+    <string name="breadgrams_exchange">Carbohydrates consumed can be recorded using an appropriate exchange system (e.g. DAFNE "CHO" exchanges or European "Bread Units") are acceptable provided the appropriate I:C ratios are specified in profiles.</string>
     <string name="breadgrams_decay">AndroidAPS uses a dynamic model to estimate carb “decay” and calculate COB.</string>
     <string name="breadgrams_calc">If blood glucose levels are outside acceptable values (too low or too high) the bolus calculator should be used to provide suggestions for carb or insulin corrections.</string>
     <string name="breadgrams_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-to-carb-ratio-ic-g-u</string>
@@ -164,7 +164,7 @@
     <string name="isf_label_exam">Insulin Sensitivity Factor (ISF)</string>
     <string name="isf_increasingvalue">Raising ISF values will lead to more insulin delivery to cover a specific amount of carbs.</string>
     <string name="isf_decreasingvalue">Reducing ISF values lead to more insulin delivery to correct for an above target blood glucose.</string>
-    <string name="isf_noeffect">Raising or lowering ISF values will not affect the insulin delivery when AndroidAPS corrects for a below-target blood glucose.</string>
+    <string name="isf_noeffect">Raising or lowering ISF has no effect on insulin delivery when blood glucose levels are below target.</string>
     <string name="isf_preferences">ISF should be entered in your AndroidAPS Preferences.</string>
     <string name="isf_profile">Changing the ISF value in your profile is enough to apply the change.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
@@ -179,7 +179,7 @@
     <string name="profileswitch_pctwillchange"> When specifying a 90% profile switch, which answers are true?</string>
     <string name="profileswitch_basallower">Basal rates will be 10% lower.</string>
     <string name="profileswitch_isfhigher">ISF will be 10% higher.</string>
-    <string name="profileswitch_iclower">I:C ratios will be 10% lower.</string>
+    <string name="profileswitch_iclower">The value of the I:C ratio will be a 10% lower number.</string>
     <string name="profileswitch_unchanged">ISF and I:C rations will be unchanged.</string>
     <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
     <string name="profileswitch2_label">Profile Switching</string>

From 6ed733f8cf8fb423afda38147d10216d9d8953e4 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 28 Dec 2020 22:59:45 +0100
Subject: [PATCH 26/26] Objectives correction

---
 .../constraints/objectives/objectives/Objective2.java  | 10 +++++-----
 app/src/main/res/values/exam.xml                       |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

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 504b51e21a..a4e9142063 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
@@ -56,8 +56,8 @@ public class Objective2 extends Objective {
                 .hint(new Hint(R.string.isf_hint2))
         );
         tasks.add(new ExamTask(R.string.ic_label_exam, R.string.blank,"ic")
-                .option(new Option(R.string.ic_increasingvalue, false))
-                .option(new Option(R.string.ic_decreasingvalue, true))
+                .option(new Option(R.string.ic_increasingvalue, true))
+                .option(new Option(R.string.ic_decreasingvalue, false))
                 .option(new Option(R.string.ic_multiple, true))
                 .option(new Option(R.string.ic_isf, false))
                 .hint(new Hint(R.string.ic_hint1))
@@ -179,12 +179,12 @@ public class Objective2 extends Objective {
         );
         tasks.add(new ExamTask(R.string.wronginsulin_label, R.string.wronginsulin_whattodo,"wronginsulin")
                 .option(new Option(R.string.wronginsulin_careportal, false))
-                .option(new Option(R.string.wronginsulin_bolus, false))
+                .option(new Option(R.string.wronginsulin_compare, true))
                 .option(new Option(R.string.wronginsulin_prime, true))
                 .option(new Option(R.string.wrongcarbs_donothing, false))
         );
         tasks.add(new ExamTask(R.string.iob_label, R.string.blank,"iob")
-                .option(new Option(R.string.iob_deviation, true))
+                .option(new Option(R.string.iob_value, true))
                 .option(new Option(R.string.iob_hightemp, false))
                 .option(new Option(R.string.iob_negiob, true))
                 .option(new Option(R.string.iob_posiob, true))
@@ -193,7 +193,7 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.breadgrams_grams, true))
                 .option(new Option(R.string.breadgrams_exchange, false))
                 .option(new Option(R.string.breadgrams_decay, true))
-                .option(new Option(R.string.breadgrams_calc, false))
+                .option(new Option(R.string.breadgrams_calc, true))
                 .hint(new Hint(R.string.breadgrams_hint1))
         );
         tasks.add(new ExamTask(R.string.extendedcarbs_label, R.string.extendedcarbs_handling,"extendedcarbs")
diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml
index 9dea519803..e4673a4d08 100644
--- a/app/src/main/res/values/exam.xml
+++ b/app/src/main/res/values/exam.xml
@@ -132,20 +132,20 @@
     <string name="wronginsulin_label">Insulin delivery/entry errors</string>
     <string name="wronginsulin_whattodo">What should you do if you received less insulin than the pump history suggests e.g. due to an occlusion, a failed cannula or forgetting to reattach the pump after a shower? </string>
     <string name="wronginsulin_careportal">Delete insulin data from Nightscout Careportal to remove it from the pump history.</string>
-    <string name="wronginsulin_bolus">Bolus the missing insulin using the Insulin button in Overview.</string>
+    <string name="wronginsulin_compare">Compare values in AndroidAPS and pump history.</string>
     <string name="wronginsulin_prime">Bolus a proportion of your calculated ‘missed’ insulin by either syringe/pen or using a prime.</string>
     <string name="wronginsulin_donothing">Do nothing and allow AndroidAPS to correct any resulting high blood glucose level.</string>
     <string name="iob_label">Insulin on Board (IOB)</string>
     <string name="iob_which">Check all the correct answers.</string>
-    <string name="iob_deviation">IOB describes the current deviation from expected insulin required based on your profile and settings.</string>
+    <string name="iob_value">IOB value is affected by issued temporary basals.</string>
     <string name="iob_hightemp">High temp basal will not be given when your blood sugar is below target.</string>
     <string name="iob_negiob">Negative IOB for a substantial period in the absence of exercise suggests your profile is too strong and less insulin is needed in your settings.</string>
     <string name="iob_posiob">Positive IOB for a substantial period suggests insulin resistance or unannounced meals.</string>
     <string name="breadgrams_label">Carb entry and boluses</string>
     <string name="breadgrams_grams">Only grams should be used for estimating and recording carbohydrates consumed.</string>
-    <string name="breadgrams_exchange">Carbohydrates consumed can be recorded using an appropriate exchange system (e.g. DAFNE "CHO" exchanges or European "Bread Units") are acceptable provided the appropriate I:C ratios are specified in profiles.</string>
+    <string name="breadgrams_exchange">Carbohydrates consumed can be recorded using an appropriate exchange system (e.g. DAFNE "CHO" exchanges or European "Bread Units").</string>
     <string name="breadgrams_decay">AndroidAPS uses a dynamic model to estimate carb “decay” and calculate COB.</string>
-    <string name="breadgrams_calc">If blood glucose levels are outside acceptable values (too low or too high) the bolus calculator should be used to provide suggestions for carb or insulin corrections.</string>
+    <string name="breadgrams_calc">If blood glucose levels are outside acceptable values (too low or too high) the bolus calculator can be used to provide suggestions for carb or insulin corrections.</string>
     <string name="breadgrams_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-to-carb-ratio-ic-g-u</string>
     <string name="extendedcarbs_label">e-carbs</string>
     <string name="extendedcarbs_handling">What could you use e-carbs (extended carbs) for?</string>