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 234fffb266..9c23278ca3 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
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.constraints.objectives.objectives;
 
+import java.util.Collections;
 import java.util.List;
 
 import info.nightscout.androidaps.R;
@@ -33,5 +34,37 @@ 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, R.string.pumpdisconnect_whattodo,"pumpdisconnect")
+                .option(new Option(R.string.pumpdisconnect_letknow, true))
+                .option(new Option(R.string.pumpdisconnect_dontchnage, false))
+                .hint(new Hint(R.string.pumpdisconnect_hint1))
+        );
+        tasks.add(new ExamTask(R.string.objectives, R.string.objectives_howtosave,"objectives")
+                .option(new Option(R.string.objectives_writetopaper, false))
+                .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_doexportafterfirtssettings, true))
+                .hint(new Hint(R.string.objectives_hint1))
+        );
+        tasks.add(new ExamTask(R.string.noisycgm, 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_turnoffcgmreceiver, false))
+                .option(new Option(R.string.noisycgm_checksmoothing, true))
+                .hint(new Hint(R.string.noisycgm_hint1))
+        );
+
+        for (Task task : tasks)
+            Collections.shuffle(((ExamTask)task).options);
+    }
+
+    @Override
+    public boolean isRevertable() {
+        return true;
+    }
+
 }
diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml
index 5cb4444c09..688eb2d825 100644
--- a/app/src/main/res/values/exam.xml
+++ b/app/src/main/res/values/exam.xml
@@ -19,5 +19,26 @@
     <string name="offlineprofile">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">Taking off pump</string>
+    <string name="pumpdisconnect_whattodo">What to do when taking the pump off</string>
+    <string name="pumpdisconnect_letknow">Let loop know that there is no insulin running to your body by clicking disconnect pump</string>
+    <string name="pumpdisconnect_dontchnage">don\'t change anything</string>
+    <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
+    <string name="objectives_howtosave">What is recommended?</string>
+    <string name="objectives_writetopaper">write every setting you did to paper and make a copy of it</string>
+    <string name="objectives_exportsettings">export settings from Maintenance</string>
+    <string name="objectives_storeelsewhere">store exported file to another place like email, Dropbox, Google drive …</string>
+    <string name="objectives_doexportonstart">do export right after you install AAPS</string>
+    <string name="objectives_doexportafterchange">do export after every change</string>
+    <string name="objectives_doexportafterfirtssettings">do export when you finish initial setting</string>
+    <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/ExportImportSettings.html</string>
+    <string name="noisycgm">Noisy CGM</string>
+    <string name="noisycgm_whattodo">What to do when you see CGM signal being too noisy</string>
+    <string name="nothing">nothing</string>
+    <string name="noisycgm_pause">pause closed loop mode</string>
+    <string name="noisycgm_replacesensor">replace sensor</string>
+    <string name="noisycgm_turnoffcgmreceiver">turn off CGM receiver</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">check if input data is smoothed</string>
 
 </resources>