diff --git a/.travis.yml b/.travis.yml
index 52552b3ceb..73fe4b80d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,12 +7,15 @@ android:
   components:
   - platform-tools
   - tools
-  - build-tools-26.0.2
+  - build-tools-27.0.2
   - android-23
   - extra-google-m2repository
   - extra-android-m2repository
   - extra-google-google_play_services
   
+before_install:
+- yes | sdkmanager "platforms;android-27"
+
 script:
   # Unit Test
   - ./gradlew test jacocoTestReport
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000..db66ffec38
--- /dev/null
+++ b/ISSUE_TEMPLATE.md
@@ -0,0 +1,10 @@
+Reporting bugs
+--------------
+- Note the precise time the problem occurred and describe the circumstances and steps that caused
+  the problem
+- Note the Build version (found in the About dialog in the app, when pressing the three dots in the
+  upper-right corner).
+- Obtain the app's log files, which can be found on the phone in
+  _/storage/emulated/0/Android/data/info.nightscout.androidaps/_
+  See https://github.com/MilosKozak/AndroidAPS/wiki/Accessing-logfiles
+- Open an issue at https://github.com/MilosKozak/AndroidAPS/issues/new
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 3289276b59..b83ba004c1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,9 +12,10 @@ buildscript {
 apply plugin: "com.android.application"
 apply plugin: "io.fabric"
 apply plugin: "jacoco-android"
+apply plugin: 'com.jakewharton.butterknife'
 
 ext {
-    supportLibraryVersion = "23.4.0"
+    supportLibraryVersion = "27.0.2"
     ormLiteVersion = "4.46"
     powermockVersion = "1.7.3"
     dexmakerVersion = "1.2"
@@ -47,8 +48,8 @@ def generateGitBuild = { ->
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "26.0.2"
+    compileSdkVersion 27
+    buildToolsVersion "${supportLibraryVersion}"
 
     defaultConfig {
         applicationId "info.nightscout.androidaps"
@@ -56,7 +57,7 @@ android {
         targetSdkVersion 23
         multiDexEnabled true
         versionCode 1500
-        version "1.57-dev"
+        version "1.59-dev"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", generateGitBuild()
 
@@ -65,6 +66,13 @@ android {
         }
     }
     lintOptions {
+        // TODO remove once wear dependency com.google.android.gms:play-services-wearable:7.3.0
+        // has been upgraded (requiring significant code changes), which currently fails release
+        // build with a deprecation warning
+        //abortOnError false
+        // (disabled entirely to avoid reports on the error, which would still be displayed
+        //  and it's easy to overlook that it's ignored)
+        checkReleaseBuilds false
         disable 'MissingTranslation'
         disable 'ExtraTranslation'
     }
@@ -206,6 +214,9 @@ dependencies {
 
     compile "net.danlew:android.joda:2.9.9.1"
 
+    api "com.jakewharton:butterknife:8.8.1"
+    annotationProcessor "com.jakewharton:butterknife-compiler:8.8.1"
+
     testCompile "junit:junit:4.12"
     testCompile "org.json:json:20140107"
     testCompile "org.mockito:mockito-core:2.7.22"
diff --git a/app/src/main/assets/OpenAPSSMB/basal-set-temp.js b/app/src/main/assets/OpenAPSSMB/basal-set-temp.js
new file mode 100644
index 0000000000..1686ea2c47
--- /dev/null
+++ b/app/src/main/assets/OpenAPSSMB/basal-set-temp.js
@@ -0,0 +1,61 @@
+'use strict';
+
+function reason(rT, msg) {
+  rT.reason = (rT.reason ? rT.reason + '. ' : '') + msg;
+  console.error(msg);
+}
+
+var tempBasalFunctions = {};
+
+tempBasalFunctions.getMaxSafeBasal = function getMaxSafeBasal(profile) {
+
+	var max_daily_safety_multiplier = (isNaN(profile.max_daily_safety_multiplier) || profile.max_daily_safety_multiplier == null) ? 3 : profile.max_daily_safety_multiplier;
+	var current_basal_safety_multiplier = (isNaN(profile.current_basal_safety_multiplier) || profile.current_basal_safety_multiplier == null) ? 4 : profile.current_basal_safety_multiplier;
+	
+	return Math.min(profile.max_basal, max_daily_safety_multiplier * profile.max_daily_basal, current_basal_safety_multiplier * profile.current_basal);
+};
+
+tempBasalFunctions.setTempBasal = function setTempBasal(rate, duration, profile, rT, currenttemp) {
+    //var maxSafeBasal = Math.min(profile.max_basal, 3 * profile.max_daily_basal, 4 * profile.current_basal);
+    
+    var maxSafeBasal = tempBasalFunctions.getMaxSafeBasal(profile);
+var round_basal = require('./round-basal');
+    
+    if (rate < 0) { 
+        rate = 0; 
+    } // if >30m @ 0 required, zero temp will be extended to 30m instead
+    else if (rate > maxSafeBasal) { 
+        rate = maxSafeBasal; 
+    }
+
+    var suggestedRate = round_basal(rate, profile);
+    if (typeof(currenttemp) !== 'undefined' && typeof(currenttemp.duration) !== 'undefined' && typeof(currenttemp.rate) !== 'undefined' && currenttemp.duration > (duration-10) && currenttemp.duration <= 120 && suggestedRate <= currenttemp.rate * 1.2 && suggestedRate >= currenttemp.rate * 0.8) {
+        rT.reason += " "+currenttemp.duration+"m left and " + currenttemp.rate + " ~ req " + suggestedRate + "U/hr: no temp required";
+        return rT;
+    }
+
+    if (suggestedRate === profile.current_basal) {
+      if (profile.skip_neutral_temps) {
+        if (typeof(currenttemp) !== 'undefined' && typeof(currenttemp.duration) !== 'undefined' && currenttemp.duration > 0) {
+          reason(rT, 'Suggested rate is same as profile rate, a temp basal is active, canceling current temp');
+          rT.duration = 0;
+          rT.rate = 0;
+          return rT;
+        } else {
+          reason(rT, 'Suggested rate is same as profile rate, no temp basal is active, doing nothing');
+          return rT;
+        }
+      } else {
+        reason(rT, 'Setting neutral temp basal of ' + profile.current_basal + 'U/hr');
+        rT.duration = duration;
+        rT.rate = suggestedRate;
+        return rT;
+      }
+    } else {
+      rT.duration = duration;
+      rT.rate = suggestedRate;
+      return rT;
+    }
+};
+
+module.exports = tempBasalFunctions;
\ No newline at end of file
diff --git a/app/src/main/assets/OpenAPSSMB/determine-basal.js b/app/src/main/assets/OpenAPSSMB/determine-basal.js
new file mode 100644
index 0000000000..84bd684cf6
--- /dev/null
+++ b/app/src/main/assets/OpenAPSSMB/determine-basal.js
@@ -0,0 +1,1146 @@
+/*
+  Determine Basal
+
+  Released under MIT license. See the accompanying LICENSE.txt file for
+  full terms and conditions
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+*/
+
+
+var round_basal = require('../round-basal')
+
+// Rounds value to 'digits' decimal places
+function round(value, digits)
+{
+    if (! digits) { digits = 0; }
+    var scale = Math.pow(10, digits);
+    return Math.round(value * scale) / scale;
+}
+
+// we expect BG to rise or fall at the rate of BGI,
+// adjusted by the rate at which BG would need to rise /
+// fall to get eventualBG to target over 2 hours
+function calculate_expected_delta(target_bg, eventual_bg, bgi) {
+    // (hours * mins_per_hour) / 5 = how many 5 minute periods in 2h = 24
+    var five_min_blocks = (2 * 60) / 5;
+    var target_delta = target_bg - eventual_bg;
+    var expectedDelta = round(bgi + (target_delta / five_min_blocks), 1);
+    return expectedDelta;
+}
+
+
+function convert_bg(value, profile)
+{
+    if (profile.out_units == "mmol/L")
+    {
+        return round(value / 18, 1).toFixed(1);
+    }
+    else
+    {
+        return Math.round(value);
+    }
+}
+
+var determine_basal = function determine_basal(glucose_status, currenttemp, iob_data, profile, autosens_data, meal_data, tempBasalFunctions, microBolusAllowed, reservoir_data) {
+    var rT = {}; //short for requestedTemp
+
+    var deliverAt = new Date();
+
+    if (typeof profile === 'undefined' || typeof profile.current_basal === 'undefined') {
+        rT.error ='Error: could not get current basal rate';
+        return rT;
+    }
+    var profile_current_basal = round_basal(profile.current_basal, profile);
+    var basal = profile_current_basal;
+
+    var systemTime = new Date();
+    var bgTime = new Date(glucose_status.date);
+    var minAgo = round( (systemTime - bgTime) / 60 / 1000 ,1);
+
+    var bg = glucose_status.glucose;
+    if (bg < 39) {  //Dexcom is in ??? mode or calibrating
+        rT.reason = "CGM is calibrating or in ??? state";
+    }
+    if (minAgo > 12 || minAgo < -5) { // Dexcom data is too old, or way in the future
+        rT.reason = "If current system time "+systemTime+" is correct, then BG data is too old. The last BG data was read "+minAgo+"m ago at "+bgTime;
+    }
+    if (bg < 39 || minAgo > 12 || minAgo < -5) {
+        if (currenttemp.rate >= basal) { // high temp is running
+            rT.reason += ". Canceling high temp basal of "+currenttemp.rate;
+            rT.deliverAt = deliverAt;
+            rT.temp = 'absolute';
+            rT.duration = 0;
+            rT.rate = 0;
+            return rT;
+            //return tempBasalFunctions.setTempBasal(basal, 30, profile, rT, currenttemp);
+        } else if ( currenttemp.rate == 0 && currenttemp.duration > 30 ) { //shorten long zero temps to 30m
+            rT.reason += ". Shortening " + currenttemp.duration + "m long zero temp to 30m. ";
+            rT.deliverAt = deliverAt;
+            rT.temp = 'absolute';
+            rT.duration = 30;
+            rT.rate = 0;
+            return rT;
+            //return tempBasalFunctions.setTempBasal(0, 30, profile, rT, currenttemp);
+        } else { //do nothing.
+            rT.reason += ". Temp " + currenttemp.rate + " <= current basal " + basal + "U/hr; doing nothing. ";
+            return rT;
+        }
+    }
+
+    var max_iob = profile.max_iob; // maximum amount of non-bolus IOB OpenAPS will ever deliver
+
+    // if min and max are set, then set target to their average
+    var target_bg;
+    var min_bg;
+    var max_bg;
+    if (typeof profile.min_bg !== 'undefined') {
+            min_bg = profile.min_bg;
+    }
+    if (typeof profile.max_bg !== 'undefined') {
+            max_bg = profile.max_bg;
+    }
+    if (typeof profile.min_bg !== 'undefined' && typeof profile.max_bg !== 'undefined') {
+        target_bg = (profile.min_bg + profile.max_bg) / 2;
+    } else {
+        rT.error ='Error: could not determine target_bg. ';
+        return rT;
+    }
+
+    var sensitivityRatio;
+    var high_temptarget_raises_sensitivity = profile.exercise_mode || profile.high_temptarget_raises_sensitivity;
+    var normalTarget = 100; // evaluate high/low temptarget against 100, not scheduled basal (which might change)
+    if ( profile.half_basal_exercise_target ) {
+        var halfBasalTarget = profile.half_basal_exercise_target;
+    } else {
+        var halfBasalTarget = 160; // when temptarget is 160 mg/dL, run 50% basal (120 = 75%; 140 = 60%)
+        // 80 mg/dL with low_temptarget_lowers_sensitivity would give 1.5x basal, but is limited to autosens_max (1.2x by default)
+    }
+    if ( high_temptarget_raises_sensitivity && profile.temptargetSet && target_bg > normalTarget + 10
+        || profile.low_temptarget_lowers_sensitivity && profile.temptargetSet && target_bg < normalTarget ) {
+        // w/ target 100, temp target 110 = .89, 120 = 0.8, 140 = 0.67, 160 = .57, and 200 = .44
+        // e.g.: Sensitivity ratio set to 0.8 based on temp target of 120; Adjusting basal from 1.65 to 1.35; ISF from 58.9 to 73.6
+        //sensitivityRatio = 2/(2+(target_bg-normalTarget)/40);
+        var c = halfBasalTarget - normalTarget;
+        sensitivityRatio = c/(c+target_bg-normalTarget);
+        // limit sensitivityRatio to profile.autosens_max (1.2x by default)
+        sensitivityRatio = Math.min(sensitivityRatio, profile.autosens_max);
+        sensitivityRatio = round(sensitivityRatio,2);
+        console.error("Sensitivity ratio set to "+sensitivityRatio+" based on temp target of "+target_bg+"; ");
+    } else if (typeof autosens_data !== 'undefined' ) {
+        sensitivityRatio = autosens_data.ratio;
+        console.error("Autosens ratio: "+sensitivityRatio+"; ");
+    }
+    if (sensitivityRatio) {
+        basal = profile.current_basal * sensitivityRatio;
+        basal = round_basal(basal, profile);
+        if (basal != profile_current_basal) {
+            console.error("Adjusting basal from "+profile_current_basal+" to "+basal+"; ");
+        } else {
+            console.error("Basal unchanged: "+basal+"; ");
+        }
+    }
+
+    // adjust min, max, and target BG for sensitivity, such that 50% increase in ISF raises target from 100 to 120
+    if (profile.temptargetSet) {
+        //console.error("Temp Target set, not adjusting with autosens; ");
+    } else if (typeof autosens_data !== 'undefined' ) {
+        if ( profile.sensitivity_raises_target && autosens_data.ratio < 1 || profile.resistance_lowers_target && autosens_data.ratio > 1 ) {
+            // with a target of 100, default 0.7-1.2 autosens min/max range would allow a 93-117 target range
+            min_bg = round((min_bg - 60) / autosens_data.ratio) + 60;
+            max_bg = round((max_bg - 60) / autosens_data.ratio) + 60;
+            new_target_bg = round((target_bg - 60) / autosens_data.ratio) + 60;
+            // don't allow target_bg below 80
+            new_target_bg = Math.max(80, new_target_bg);
+            if (target_bg == new_target_bg) {
+                console.error("target_bg unchanged: "+new_target_bg+"; ");
+            } else {
+                console.error("target_bg from "+target_bg+" to "+new_target_bg+"; ");
+            }
+            target_bg = new_target_bg;
+        }
+    }
+
+    if (typeof iob_data === 'undefined' ) {
+        rT.error ='Error: iob_data undefined. ';
+        return rT;
+    }
+
+    var iobArray = iob_data;
+    if (typeof(iob_data.length) && iob_data.length > 1) {
+        iob_data = iobArray[0];
+        //console.error(JSON.stringify(iob_data[0]));
+    }
+
+    if (typeof iob_data.activity === 'undefined' || typeof iob_data.iob === 'undefined' ) {
+        rT.error ='Error: iob_data missing some property. ';
+        return rT;
+    }
+
+    var tick;
+
+    if (glucose_status.delta > -0.5) {
+        tick = "+" + round(glucose_status.delta,0);
+    } else {
+        tick = round(glucose_status.delta,0);
+    }
+    //var minDelta = Math.min(glucose_status.delta, glucose_status.short_avgdelta, glucose_status.long_avgdelta);
+    var minDelta = Math.min(glucose_status.delta, glucose_status.short_avgdelta);
+    var minAvgDelta = Math.min(glucose_status.short_avgdelta, glucose_status.long_avgdelta);
+    var maxDelta = Math.max(glucose_status.delta, glucose_status.short_avgdelta, glucose_status.long_avgdelta);
+
+    var profile_sens = round(profile.sens,1)
+    var sens = profile.sens;
+    if (typeof autosens_data !== 'undefined' ) {
+        sens = profile.sens / sensitivityRatio;
+        sens = round(sens, 1);
+        if (sens != profile_sens) {
+            console.error("ISF from "+profile_sens+" to "+sens);
+        } else {
+            console.error("ISF unchanged: "+sens);
+        }
+        //console.error(" (autosens ratio "+sensitivityRatio+")");
+    }
+    console.error("; CR:",profile.carb_ratio);
+
+    // compare currenttemp to iob_data.lastTemp and cancel temp if they don't match
+    var lastTempAge;
+    if (typeof iob_data.lastTemp !== 'undefined' ) {
+        lastTempAge = round(( new Date().getTime() - iob_data.lastTemp.date ) / 60000); // in minutes
+    // }  ---- added to not produce errors
+    } else {
+        lastTempAge = 0;
+    }
+    //console.error("currenttemp:",currenttemp,"lastTemp:",JSON.stringify(iob_data.lastTemp),"lastTempAge:",lastTempAge,"m");
+    tempModulus = (lastTempAge + currenttemp.duration) % 30;
+    console.error("currenttemp:",currenttemp,"lastTempAge:",lastTempAge,"m","tempModulus:",tempModulus,"m");
+    rT.temp = 'absolute';
+    rT.deliverAt = deliverAt;
+    if ( microBolusAllowed && currenttemp && iob_data.lastTemp && currenttemp.rate != iob_data.lastTemp.rate ) {
+        rT.reason = "Warning: currenttemp rate "+currenttemp.rate+" != lastTemp rate "+iob_data.lastTemp.rate+" from pumphistory; setting neutral temp of "+basal+".";
+        return tempBasalFunctions.setTempBasal(basal, 30, profile, rT, currenttemp);
+    }
+    if ( currenttemp && iob_data.lastTemp && currenttemp.duration > 0 ) {
+        // TODO: fix this (lastTemp.duration is how long it has run; currenttemp.duration is time left
+        //if ( currenttemp.duration < iob_data.lastTemp.duration - 2) {
+            //rT.reason = "Warning: currenttemp duration "+currenttemp.duration+" << lastTemp duration "+round(iob_data.lastTemp.duration,1)+" from pumphistory; setting neutral temp of "+basal+".";
+            //return tempBasalFunctions.setTempBasal(basal, 30, profile, rT, currenttemp);
+        //}
+        //console.error(lastTempAge, round(iob_data.lastTemp.duration,1), round(lastTempAge - iob_data.lastTemp.duration,1));
+        var lastTempEnded = lastTempAge - iob_data.lastTemp.duration
+        if ( lastTempEnded > 5 ) {
+            rT.reason = "Warning: currenttemp running but lastTemp from pumphistory ended "+lastTempEnded+"m ago; setting neutral temp of "+basal+".";
+            //console.error(currenttemp, round(iob_data.lastTemp,1), round(lastTempAge,1));
+            return tempBasalFunctions.setTempBasal(basal, 30, profile, rT, currenttemp);
+        }
+        // TODO: figure out a way to do this check that doesn't fail across basal schedule boundaries
+        //if ( tempModulus < 25 && tempModulus > 5 ) {
+            //rT.reason = "Warning: currenttemp duration "+currenttemp.duration+" + lastTempAge "+lastTempAge+" isn't a multiple of 30m; setting neutral temp of "+basal+".";
+            //console.error(rT.reason);
+            //return tempBasalFunctions.setTempBasal(basal, 30, profile, rT, currenttemp);
+        //}
+    }
+
+    //calculate BG impact: the amount BG "should" be rising or falling based on insulin activity alone
+    var bgi = round(( -iob_data.activity * sens * 5 ), 2);
+    // project deviations for 30 minutes
+    var deviation = round( 30 / 5 * ( minDelta - bgi ) );
+    // don't overreact to a big negative delta: use minAvgDelta if deviation is negative
+    if (deviation < 0) {
+        deviation = round( (30 / 5) * ( minAvgDelta - bgi ) );
+        // and if deviation is still negative, use long_avgdelta
+        if (deviation < 0) {
+            deviation = round( (30 / 5) * ( glucose_status.long_avgdelta - bgi ) );
+        }
+    }
+
+    // calculate the naive (bolus calculator math) eventual BG based on net IOB and sensitivity
+    if (iob_data.iob > 0) {
+        var naive_eventualBG = round( bg - (iob_data.iob * sens) );
+    } else { // if IOB is negative, be more conservative and use the lower of sens, profile.sens
+        var naive_eventualBG = round( bg - (iob_data.iob * Math.min(sens, profile.sens) ) );
+    }
+    // and adjust it for the deviation above
+    var eventualBG = naive_eventualBG + deviation;
+    // calculate what portion of that is due to bolussnooze
+    //var bolusContrib = iob_data.bolussnooze * sens;
+    // and add it back in to get snoozeBG, plus another 50% to avoid low-temping at mealtime
+    //var naive_snoozeBG = round( naive_eventualBG + 1.5 * bolusContrib );
+    // adjust that for deviation like we did eventualBG
+    //var snoozeBG = naive_snoozeBG + deviation;
+
+    // adjust target BG range if needed to safely bring down high BG faster without causing lows
+    if ( bg > max_bg && profile.adv_target_adjustments && ! profile.temptargetSet ) {
+        // with target=100, as BG rises from 100 to 160, adjustedTarget drops from 100 to 80
+        var adjustedMinBG = round(Math.max(80, min_bg - (bg - min_bg)/3 ),0);
+        var adjustedTargetBG =round( Math.max(80, target_bg - (bg - target_bg)/3 ),0);
+        var adjustedMaxBG = round(Math.max(80, max_bg - (bg - max_bg)/3 ),0);
+        // if eventualBG, naive_eventualBG, and target_bg aren't all above adjustedMinBG, don’t use it
+        //console.error("naive_eventualBG:",naive_eventualBG+", eventualBG:",eventualBG);
+        if (eventualBG > adjustedMinBG && naive_eventualBG > adjustedMinBG && min_bg > adjustedMinBG) {
+            console.error("Adjusting targets for high BG: min_bg from "+min_bg+" to "+adjustedMinBG+"; ");
+            min_bg = adjustedMinBG;
+        } else {
+            console.error("min_bg unchanged: "+min_bg+"; ");
+        }
+        // if eventualBG, naive_eventualBG, and target_bg aren't all above adjustedTargetBG, don’t use it
+        if (eventualBG > adjustedTargetBG && naive_eventualBG > adjustedTargetBG && target_bg > adjustedTargetBG) {
+            console.error("target_bg from "+target_bg+" to "+adjustedTargetBG+"; ");
+            target_bg = adjustedTargetBG;
+        } else {
+            console.error("target_bg unchanged: "+target_bg+"; ");
+        }
+        // if eventualBG, naive_eventualBG, and max_bg aren't all above adjustedMaxBG, don’t use it
+        if (eventualBG > adjustedMaxBG && naive_eventualBG > adjustedMaxBG && max_bg > adjustedMaxBG) {
+            console.error("max_bg from "+max_bg+" to "+adjustedMaxBG);
+            max_bg = adjustedMaxBG;
+        } else {
+            console.error("max_bg unchanged: "+max_bg);
+        }
+    }
+
+    var expectedDelta = calculate_expected_delta(target_bg, eventualBG, bgi);
+    if (typeof eventualBG === 'undefined' || isNaN(eventualBG)) {
+        rT.error ='Error: could not calculate eventualBG. ';
+        return rT;
+    }
+
+    // min_bg of 90 -> threshold of 65, 100 -> 70 110 -> 75, and 130 -> 85
+    var threshold = min_bg - 0.5*(min_bg-40);
+
+    //console.error(reservoir_data);
+
+    rT = {
+        'temp': 'absolute'
+        , 'bg': bg
+        , 'tick': tick
+        , 'eventualBG': eventualBG
+        //, 'snoozeBG': snoozeBG
+        , 'insulinReq': 0
+        , 'reservoir' : reservoir_data // The expected reservoir volume at which to deliver the microbolus (the reservoir volume from right before the last pumphistory run)
+        , 'deliverAt' : deliverAt // The time at which the microbolus should be delivered
+        , 'sensitivityRatio' : sensitivityRatio // autosens ratio (fraction of normal basal)
+    };
+
+    // generate predicted future BGs based on IOB, COB, and current absorption rate
+
+    var COBpredBGs = [];
+    var aCOBpredBGs = [];
+    var IOBpredBGs = [];
+    var UAMpredBGs = [];
+    var ZTpredBGs = [];
+    COBpredBGs.push(bg);
+    aCOBpredBGs.push(bg);
+    IOBpredBGs.push(bg);
+    ZTpredBGs.push(bg);
+    UAMpredBGs.push(bg);
+
+    // enable SMB whenever we have COB or UAM is enabled
+    // SMB is disabled by default, unless explicitly enabled in preferences.json
+    var enableSMB=false;
+    // disable SMB when a high temptarget is set
+    if (! microBolusAllowed) {
+        console.error("SMB disabled (!microBolusAllowed)")
+    } else if (! profile.allowSMB_with_high_temptarget && profile.temptargetSet && target_bg > 100) {
+        console.error("SMB disabled due to high temptarget of",target_bg);
+        enableSMB=false;
+    // enable SMB/UAM (if enabled in preferences) while we have COB
+    } else if (profile.enableSMB_with_COB === true && meal_data.mealCOB) {
+        if (meal_data.bwCarbs) {
+            if (profile.A52_risk_enable) {
+                console.error("Warning: SMB enabled with Bolus Wizard carbs: be sure to easy bolus 30s before using Bolus Wizard")
+                enableSMB=true;
+            } else {
+                console.error("SMB not enabled for Bolus Wizard COB");
+            }
+        } else {
+            console.error("SMB enabled for COB of",meal_data.mealCOB);
+            enableSMB=true;
+        }
+    // enable SMB/UAM (if enabled in preferences) for a full 6 hours after any carb entry
+    // (6 hours is defined in carbWindow in lib/meal/total.js)
+    } else if (profile.enableSMB_after_carbs === true && meal_data.carbs ) {
+        if (meal_data.bwCarbs) {
+            if (profile.A52_risk_enable) {
+            console.error("Warning: SMB enabled with Bolus Wizard carbs: be sure to easy bolus 30s before using Bolus Wizard")
+            enableSMB=true;
+            } else {
+                console.error("SMB not enabled for Bolus Wizard carbs");
+            }
+        } else {
+            console.error("SMB enabled for 6h after carb entry");
+            enableSMB=true;
+        }
+    // enable SMB/UAM (if enabled in preferences) if a low temptarget is set
+    } else if (profile.enableSMB_with_temptarget === true && (profile.temptargetSet && target_bg < 100)) {
+        if (meal_data.bwFound) {
+            if (profile.A52_risk_enable) {
+                console.error("Warning: SMB enabled within 6h of using Bolus Wizard: be sure to easy bolus 30s before using Bolus Wizard")
+                enableSMB=true;
+            } else {
+                console.error("enableSMB_with_temptarget not supported within 6h of using Bolus Wizard");
+            }
+        } else {
+            console.error("SMB enabled for temptarget of",convert_bg(target_bg, profile));
+            enableSMB=true;
+        }
+    // enable SMB/UAM if always-on (unless previously disabled for high temptarget)
+    } else if (profile.enableSMB_always === true) {
+        if (meal_data.bwFound) {
+            if (profile.A52_risk_enable === true) {
+                console.error("Warning: SMB enabled within 6h of using Bolus Wizard: be sure to easy bolus 30s before using Bolus Wizard")
+                enableSMB=true;
+            } else {
+                console.error("enableSMB_always not supported within 6h of using Bolus Wizard");
+            }
+        } else {
+            console.error("SMB enabled due to enableSMB_always");
+            enableSMB=true;
+        }
+    } else {
+        console.error("SMB disabled (no enableSMB preferences active)");
+    }
+    // enable UAM (if enabled in preferences) if SMB is enabled
+    var enableUAM=(profile.enableUAM && enableSMB);
+
+
+    //console.error(meal_data);
+    // carb impact and duration are 0 unless changed below
+    var ci = 0;
+    var cid = 0;
+    // calculate current carb absorption rate, and how long to absorb all carbs
+    // CI = current carb impact on BG in mg/dL/5m
+    ci = round((minDelta - bgi),1);
+    uci = round((minDelta - bgi),1);
+    // ISF (mg/dL/U) / CR (g/U) = CSF (mg/dL/g)
+    if (profile.temptargetSet) {
+        // if temptargetSet, use unadjusted profile.sens to allow activity mode sensitivityRatio to adjust CR
+        var csf = profile.sens / profile.carb_ratio;
+    } else {
+        // otherwise, use autosens-adjusted sens to counteract autosens meal insulin dosing adjustments
+        // so that autotuned CR is still in effect even when basals and ISF are being adjusted by autosens
+        var csf = sens / profile.carb_ratio;
+    }
+    var maxCarbAbsorptionRate = 30; // g/h; maximum rate to assume carbs will absorb if no CI observed
+    // limit Carb Impact to maxCarbAbsorptionRate * csf in mg/dL per 5m
+    maxCI = round(maxCarbAbsorptionRate*csf*5/60,1)
+    if (ci > maxCI) {
+        console.error("Limiting carb impact from",ci,"to",maxCI,"mg/dL/5m (",maxCarbAbsorptionRate,"g/h )");
+        ci = maxCI;
+    }
+    // set meal_carbimpact high enough to absorb all meal carbs over 6 hours
+    // total_impact (mg/dL) = CSF (mg/dL/g) * carbs (g)
+    //console.error(csf * meal_data.carbs);
+    // meal_carbimpact (mg/dL/5m) = CSF (mg/dL/g) * carbs (g) / 6 (h) * (1h/60m) * 5 (m/5m) * 2 (for linear decay)
+    //var meal_carbimpact = round((csf * meal_data.carbs / 6 / 60 * 5 * 2),1)
+    var remainingCATimeMin = 3; // h; before carb absorption starts
+    // adjust remainingCATime (instead of CR) for autosens
+    remainingCATimeMin = remainingCATimeMin / sensitivityRatio;
+    // 20 g/h means that anything <= 60g will get a remainingCATimeMin, 80g will get 4h, and 120g 6h
+    // when actual absorption ramps up it will take over from remainingCATime
+    var assumedCarbAbsorptionRate = 20; // g/h; maximum rate to assume carbs will absorb if no CI observed
+    var remainingCATime = remainingCATimeMin; // added by mike https://github.com/openaps/oref0/issues/884
+    if (meal_data.carbs) {
+        // if carbs * assumedCarbAbsorptionRate > remainingCATimeMin, raise it
+        // so <= 90g is assumed to take 3h, and 120g=4h
+        remainingCATimeMin = Math.max(remainingCATimeMin, meal_data.mealCOB/assumedCarbAbsorptionRate);
+        var lastCarbAge = round(( new Date().getTime() - meal_data.lastCarbTime ) / 60000);
+        //console.error(meal_data.lastCarbTime, lastCarbAge);
+
+        fractionCOBAbsorbed = ( meal_data.carbs - meal_data.mealCOB ) / meal_data.carbs;
+        remainingCATime = remainingCATimeMin + 1.5 * lastCarbAge/60;
+        remainingCATime = round(remainingCATime,1);
+        //console.error(fractionCOBAbsorbed, remainingCATimeAdjustment, remainingCATime)
+        console.error("Last carbs",lastCarbAge,"minutes ago; remainingCATime:",remainingCATime,"hours;",round(fractionCOBAbsorbed*100)+"% carbs absorbed");
+    }
+
+    // calculate the number of carbs absorbed over remainingCATime hours at current CI
+    // CI (mg/dL/5m) * (5m)/5 (m) * 60 (min/hr) * 4 (h) / 2 (linear decay factor) = total carb impact (mg/dL)
+    var totalCI = Math.max(0, ci / 5 * 60 * remainingCATime / 2);
+    // totalCI (mg/dL) / CSF (mg/dL/g) = total carbs absorbed (g)
+    var totalCA = totalCI / csf;
+    var remainingCarbsCap = 90; // default to 90
+    var remainingCarbsFraction = 1;
+    if (profile.remainingCarbsCap) { remainingCarbsCap = Math.min(90,profile.remainingCarbsCap); }
+    if (profile.remainingCarbsFraction) { remainingCarbsFraction = Math.min(1,profile.remainingCarbsFraction); }
+    var remainingCarbsIgnore = 1 - remainingCarbsFraction;
+    var remainingCarbs = Math.max(0, meal_data.mealCOB - totalCA - meal_data.carbs*remainingCarbsIgnore);
+    remainingCarbs = Math.min(remainingCarbsCap,remainingCarbs);
+    // assume remainingCarbs will absorb in a /\ shaped bilinear curve
+    // peaking at remainingCATime / 2 and ending at remainingCATime hours
+    // area of the /\ triangle is the same as a remainingCIpeak-height rectangle out to remainingCATime/2
+    // remainingCIpeak (mg/dL/5m) = remainingCarbs (g) * CSF (mg/dL/g) * 5 (m/5m) * 1h/60m / (remainingCATime/2) (h)
+    var remainingCIpeak = remainingCarbs * csf * 5 / 60 / (remainingCATime/2);
+    //console.error(profile.min_5m_carbimpact,ci,totalCI,totalCA,remainingCarbs,remainingCI,remainingCATime);
+    //if (meal_data.mealCOB * 3 > meal_data.carbs) { }
+
+    // calculate peak deviation in last hour, and slope from that to current deviation
+    var slopeFromMaxDeviation = round(meal_data.slopeFromMaxDeviation,2);
+    // calculate lowest deviation in last hour, and slope from that to current deviation
+    var slopeFromMinDeviation = round(meal_data.slopeFromMinDeviation,2);
+    // assume deviations will drop back down at least at 1/3 the rate they ramped up
+    var slopeFromDeviations = Math.min(slopeFromMaxDeviation,-slopeFromMinDeviation/3);
+    //console.error(slopeFromMaxDeviation);
+
+    aci = 10;
+    //5m data points = g * (1U/10g) * (40mg/dL/1U) / (mg/dL/5m)
+    // duration (in 5m data points) = COB (g) * CSF (mg/dL/g) / ci (mg/dL/5m)
+    // limit cid to remainingCATime hours: the reset goes to remainingCI
+    if (ci == 0) {
+        // avoid divide by zero
+        cid = 0;
+    } else {
+        cid = Math.min(remainingCATime*60/5/2,Math.max(0, meal_data.mealCOB * csf / ci ));
+    }
+    acid = Math.max(0, meal_data.mealCOB * csf / aci );
+    // duration (hours) = duration (5m) * 5 / 60 * 2 (to account for linear decay)
+    console.error("Carb Impact:",ci,"mg/dL per 5m; CI Duration:",round(cid*5/60*2,1),"hours; remaining CI (~2h peak):",round(remainingCIpeak,1),"mg/dL per 5m");
+    //console.error("Accel. Carb Impact:",aci,"mg/dL per 5m; ACI Duration:",round(acid*5/60*2,1),"hours");
+    var minIOBPredBG = 999;
+    var minCOBPredBG = 999;
+    var minUAMPredBG = 999;
+    var minGuardBG = bg;
+    var minCOBGuardBG = 999;
+    var minUAMGuardBG = 999;
+    var minIOBGuardBG = 999;
+    var minZTGuardBG = 999;
+    var minPredBG;
+    var avgPredBG;
+    var IOBpredBG = eventualBG;
+    var maxIOBPredBG = bg;
+    var maxCOBPredBG = bg;
+    var maxUAMPredBG = bg;
+    //var maxPredBG = bg;
+    var eventualPredBG = bg;
+    var lastIOBpredBG;
+    var lastCOBpredBG;
+    var lastUAMpredBG;
+    var lastZTpredBG;
+    var UAMduration = 0;
+    var remainingCItotal = 0;
+    var remainingCIs = [];
+    var predCIs = [];
+    try {
+        iobArray.forEach(function(iobTick) {
+            //console.error(iobTick);
+            predBGI = round(( -iobTick.activity * sens * 5 ), 2);
+            predZTBGI = round(( -iobTick.iobWithZeroTemp.activity * sens * 5 ), 2);
+            // for IOBpredBGs, predicted deviation impact drops linearly from current deviation down to zero
+            // over 60 minutes (data points every 5m)
+            predDev = ci * ( 1 - Math.min(1,IOBpredBGs.length/(60/5)) );
+            IOBpredBG = IOBpredBGs[IOBpredBGs.length-1] + predBGI + predDev;
+            // calculate predBGs with long zero temp without deviations
+            ZTpredBG = ZTpredBGs[ZTpredBGs.length-1] + predZTBGI;
+            // for COBpredBGs, predicted carb impact drops linearly from current carb impact down to zero
+            // eventually accounting for all carbs (if they can be absorbed over DIA)
+            predCI = Math.max(0, Math.max(0,ci) * ( 1 - COBpredBGs.length/Math.max(cid*2,1) ) );
+            predACI = Math.max(0, Math.max(0,aci) * ( 1 - COBpredBGs.length/Math.max(acid*2,1) ) );
+            // if any carbs aren't absorbed after remainingCATime hours, assume they'll absorb in a /\ shaped
+            // bilinear curve peaking at remainingCIpeak at remainingCATime/2 hours (remainingCATime/2*12 * 5m)
+            // and ending at remainingCATime h (remainingCATime*12 * 5m intervals)
+            var intervals = Math.min( COBpredBGs.length, (remainingCATime*12)-COBpredBGs.length );
+            var remainingCI = Math.max(0, intervals / (remainingCATime/2*12) * remainingCIpeak );
+            remainingCItotal += predCI+remainingCI;
+            remainingCIs.push(round(remainingCI,0));
+            predCIs.push(round(predCI,0));
+            //console.error(round(predCI,1)+"+"+round(remainingCI,1)+" ");
+            COBpredBG = COBpredBGs[COBpredBGs.length-1] + predBGI + Math.min(0,predDev) + predCI + remainingCI;
+            aCOBpredBG = aCOBpredBGs[aCOBpredBGs.length-1] + predBGI + Math.min(0,predDev) + predACI;
+            // for UAMpredBGs, predicted carb impact drops at slopeFromDeviations
+            // calculate predicted CI from UAM based on slopeFromDeviations
+            predUCIslope = Math.max(0, uci + ( UAMpredBGs.length*slopeFromDeviations ) );
+            // if slopeFromDeviations is too flat, predicted deviation impact drops linearly from
+            // current deviation down to zero over 3h (data points every 5m)
+            predUCImax = Math.max(0, uci * ( 1 - UAMpredBGs.length/Math.max(3*60/5,1) ) );
+            //console.error(predUCIslope, predUCImax);
+            // predicted CI from UAM is the lesser of CI based on deviationSlope or DIA
+            predUCI = Math.min(predUCIslope, predUCImax);
+            if(predUCI>0) {
+                //console.error(UAMpredBGs.length,slopeFromDeviations, predUCI);
+                UAMduration=round((UAMpredBGs.length+1)*5/60,1);
+            }
+            UAMpredBG = UAMpredBGs[UAMpredBGs.length-1] + predBGI + Math.min(0, predDev) + predUCI;
+            //console.error(predBGI, predCI, predUCI);
+            // truncate all BG predictions at 4 hours
+            if ( IOBpredBGs.length < 48) { IOBpredBGs.push(IOBpredBG); }
+            if ( COBpredBGs.length < 48) { COBpredBGs.push(COBpredBG); }
+            if ( aCOBpredBGs.length < 48) { aCOBpredBGs.push(aCOBpredBG); }
+            if ( UAMpredBGs.length < 48) { UAMpredBGs.push(UAMpredBG); }
+            if ( ZTpredBGs.length < 48) { ZTpredBGs.push(ZTpredBG); }
+            // calculate minGuardBGs without a wait from COB, UAM, IOB predBGs
+            if ( COBpredBG < minCOBGuardBG ) { minCOBGuardBG = round(COBpredBG); }
+            if ( UAMpredBG < minUAMGuardBG ) { minUAMGuardBG = round(UAMpredBG); }
+            if ( IOBpredBG < minIOBGuardBG ) { minIOBGuardBG = round(IOBpredBG); }
+            if ( ZTpredBG < minZTGuardBG ) { minZTGuardBG = round(ZTpredBG); }
+
+            // set minPredBGs starting when currently-dosed insulin activity will peak
+            // look ahead 60m (regardless of insulin type) so as to be less aggressive on slower insulins
+            var insulinPeakTime = 60;
+            // add 30m to allow for insluin delivery (SMBs or temps)
+            insulinPeakTime = 90;
+            var insulinPeak5m = (insulinPeakTime/60)*12;
+            //console.error(insulinPeakTime, insulinPeak5m, profile.insulinPeakTime, profile.curve);
+
+            // wait 90m before setting minIOBPredBG
+            if ( IOBpredBGs.length > insulinPeak5m && (IOBpredBG < minIOBPredBG) ) { minIOBPredBG = round(IOBpredBG); }
+            if ( IOBpredBG > maxIOBPredBG ) { maxIOBPredBG = IOBpredBG; }
+            // wait 85-105m before setting COB and 60m for UAM minPredBGs
+            if ( (cid || remainingCIpeak > 0) && COBpredBGs.length > insulinPeak5m && (COBpredBG < minCOBPredBG) ) { minCOBPredBG = round(COBpredBG); }
+            if ( (cid || remainingCIpeak > 0) && COBpredBG > maxIOBPredBG ) { maxCOBPredBG = COBpredBG; }
+            if ( enableUAM && UAMpredBGs.length > 12 && (UAMpredBG < minUAMPredBG) ) { minUAMPredBG = round(UAMpredBG); }
+            if ( enableUAM && UAMpredBG > maxIOBPredBG ) { maxUAMPredBG = UAMpredBG; }
+        });
+        // set eventualBG to include effect of carbs
+        //console.error("PredBGs:",JSON.stringify(predBGs));
+    } catch (e) {
+        console.error("Problem with iobArray.  Optional feature Advanced Meal Assist disabled:",e);
+    }
+    if (meal_data.mealCOB) {
+        console.error("predCIs (mg/dL/5m):",predCIs.join(" "));
+        console.error("remainingCIs:      ",remainingCIs.join(" "));
+    }
+    //,"totalCA:",round(totalCA,2),"remainingCItotal/csf+totalCA:",round(remainingCItotal/csf+totalCA,2));
+    rT.predBGs = {};
+    IOBpredBGs.forEach(function(p, i, theArray) {
+        theArray[i] = round(Math.min(401,Math.max(39,p)));
+    });
+    for (var i=IOBpredBGs.length-1; i > 12; i--) {
+        if (IOBpredBGs[i-1] != IOBpredBGs[i]) { break; }
+        else { IOBpredBGs.pop(); }
+    }
+    rT.predBGs.IOB = IOBpredBGs;
+    lastIOBpredBG=round(IOBpredBGs[IOBpredBGs.length-1]);
+    ZTpredBGs.forEach(function(p, i, theArray) {
+        theArray[i] = round(Math.min(401,Math.max(39,p)));
+    });
+    for (var i=ZTpredBGs.length-1; i > 6; i--) {
+        //if (ZTpredBGs[i-1] != ZTpredBGs[i]) { break; }
+        // stop displaying ZTpredBGs once they're rising and above target
+        if (ZTpredBGs[i-1] >= ZTpredBGs[i] || ZTpredBGs[i] < target_bg) { break; }
+        else { ZTpredBGs.pop(); }
+    }
+    rT.predBGs.ZT = ZTpredBGs;
+    lastZTpredBG=round(ZTpredBGs[ZTpredBGs.length-1]);
+    if (meal_data.mealCOB > 0) {
+        aCOBpredBGs.forEach(function(p, i, theArray) {
+            theArray[i] = round(Math.min(401,Math.max(39,p)));
+        });
+        for (var i=aCOBpredBGs.length-1; i > 12; i--) {
+            if (aCOBpredBGs[i-1] != aCOBpredBGs[i]) { break; }
+            else { aCOBpredBGs.pop(); }
+        }
+        // disable for now.  may want to add a preference to re-enable
+        //rT.predBGs.aCOB = aCOBpredBGs;
+    }
+    if (meal_data.mealCOB > 0 && ( ci > 0 || remainingCIpeak > 0 )) {
+        COBpredBGs.forEach(function(p, i, theArray) {
+            theArray[i] = round(Math.min(401,Math.max(39,p)));
+        });
+        for (var i=COBpredBGs.length-1; i > 12; i--) {
+            if (COBpredBGs[i-1] != COBpredBGs[i]) { break; }
+            else { COBpredBGs.pop(); }
+        }
+        rT.predBGs.COB = COBpredBGs;
+        lastCOBpredBG=round(COBpredBGs[COBpredBGs.length-1]);
+        eventualBG = Math.max(eventualBG, round(COBpredBGs[COBpredBGs.length-1]) );
+    }
+    if (ci > 0 || remainingCIpeak > 0) {
+        if (enableUAM) {
+            UAMpredBGs.forEach(function(p, i, theArray) {
+                theArray[i] = round(Math.min(401,Math.max(39,p)));
+            });
+            for (var i=UAMpredBGs.length-1; i > 12; i--) {
+                if (UAMpredBGs[i-1] != UAMpredBGs[i]) { break; }
+                else { UAMpredBGs.pop(); }
+            }
+            rT.predBGs.UAM = UAMpredBGs;
+            lastUAMpredBG=round(UAMpredBGs[UAMpredBGs.length-1]);
+            if (UAMpredBGs[UAMpredBGs.length-1]) {
+                eventualBG = Math.max(eventualBG, round(UAMpredBGs[UAMpredBGs.length-1]) );
+            }
+        }
+
+        // set eventualBG and snoozeBG based on COB or UAM predBGs
+        rT.eventualBG = eventualBG;
+    }
+
+    console.error("UAM Impact:",uci,"mg/dL per 5m; UAM Duration:",UAMduration,"hours");
+
+
+    minIOBPredBG = Math.max(39,minIOBPredBG);
+    minCOBPredBG = Math.max(39,minCOBPredBG);
+    minUAMPredBG = Math.max(39,minUAMPredBG);
+    minPredBG = round(minIOBPredBG);
+
+    var fractionCarbsLeft = meal_data.mealCOB/meal_data.carbs;
+    // if we have COB and UAM is enabled, average both
+    if ( minUAMPredBG < 999 && minCOBPredBG < 999 ) {
+        // weight COBpredBG vs. UAMpredBG based on how many carbs remain as COB
+        avgPredBG = round( (1-fractionCarbsLeft)*UAMpredBG + fractionCarbsLeft*COBpredBG );
+    // if UAM is disabled, average IOB and COB
+    } else if ( minCOBPredBG < 999 ) {
+        avgPredBG = round( (IOBpredBG + COBpredBG)/2 );
+    // if we have UAM but no COB, average IOB and UAM
+    } else if ( minUAMPredBG < 999 ) {
+        avgPredBG = round( (IOBpredBG + UAMpredBG)/2 );
+    } else {
+        avgPredBG = round( IOBpredBG );
+    }
+    // if avgPredBG is below minZTGuardBG, bring it up to that level
+    if ( minZTGuardBG > avgPredBG ) {
+        avgPredBG = minZTGuardBG;
+    }
+
+    // if we have both minCOBGuardBG and minUAMGuardBG, blend according to fractionCarbsLeft
+    if ( (cid || remainingCIpeak > 0) ) {
+        if ( enableUAM ) {
+            minGuardBG = fractionCarbsLeft*minCOBGuardBG + (1-fractionCarbsLeft)*minUAMGuardBG;
+        } else {
+            minGuardBG = minCOBGuardBG;
+        }
+    } else if ( enableUAM ) {
+        minGuardBG = minUAMGuardBG;
+    } else {
+        minGuardBG = minIOBGuardBG;
+    }
+    minGuardBG = round(minGuardBG);
+    //console.error(minCOBGuardBG, minUAMGuardBG, minIOBGuardBG, minGuardBG);
+
+    var minZTUAMPredBG = minUAMPredBG;
+    // if minZTGuardBG is below threshold, bring down any super-high minUAMPredBG by averaging
+    // this helps prevent UAM from giving too much insulin in case absorption falls off suddenly
+    if ( minZTGuardBG < threshold ) {
+        minZTUAMPredBG = (minUAMPredBG + minZTGuardBG) / 2;
+    // if minZTGuardBG is between threshold and target, blend in the averaging
+    } else if ( minZTGuardBG < target_bg ) {
+        // target 100, threshold 70, minZTGuardBG 85 gives 50%: (85-70) / (100-70)
+        var blendPct = (minZTGuardBG-threshold) / (target_bg-threshold);
+        var blendedMinZTGuardBG = minUAMPredBG*blendPct + minZTGuardBG*(1-blendPct);
+        minZTUAMPredBG = (minUAMPredBG + blendedMinZTGuardBG) / 2;
+        //minZTUAMPredBG = minUAMPredBG - target_bg + minZTGuardBG;
+    // if minUAMPredBG is below minZTGuardBG, bring minUAMPredBG up by averaging
+    // this allows more insulin if lastUAMPredBG is below target, but minZTGuardBG is still high
+    } else if ( minZTGuardBG > minUAMPredBG ) {
+        minZTUAMPredBG = (minUAMPredBG + minZTGuardBG) / 2;
+    }
+    minZTUAMPredBG = round(minZTUAMPredBG);
+    //console.error("minUAMPredBG:",minUAMPredBG,"minZTGuardBG:",minZTGuardBG,"minZTUAMPredBG:",minZTUAMPredBG);
+    // if any carbs have been entered recently
+    if (meal_data.carbs) {
+        // average the minIOBPredBG and minUAMPredBG if available
+        /*
+        if ( minUAMPredBG < 999 ) {
+            avgMinPredBG = round( (minIOBPredBG+minUAMPredBG)/2 );
+        } else {
+            avgMinPredBG = minIOBPredBG;
+        }
+        */
+
+        // if UAM is disabled, use max of minIOBPredBG, minCOBPredBG
+        if ( ! enableUAM && minCOBPredBG < 999 ) {
+            minPredBG = round(Math.max(minIOBPredBG, minCOBPredBG));
+        // if we have COB, use minCOBPredBG, or blendedMinPredBG if it's higher
+        } else if ( minCOBPredBG < 999 ) {
+            // calculate blendedMinPredBG based on how many carbs remain as COB
+            //blendedMinPredBG = fractionCarbsLeft*minCOBPredBG + (1-fractionCarbsLeft)*minUAMPredBG;
+            blendedMinPredBG = fractionCarbsLeft*minCOBPredBG + (1-fractionCarbsLeft)*minZTUAMPredBG;
+            // if blendedMinPredBG > minCOBPredBG, use that instead
+            minPredBG = round(Math.max(minIOBPredBG, minCOBPredBG, blendedMinPredBG));
+        // if carbs have been entered, but have expired, use minUAMPredBG
+        } else {
+            //minPredBG = minUAMPredBG;
+            minPredBG = minZTUAMPredBG;
+        }
+    // in pure UAM mode, use the higher of minIOBPredBG,minUAMPredBG
+    } else if ( enableUAM ) {
+        //minPredBG = round(Math.max(minIOBPredBG,minUAMPredBG));
+        minPredBG = round(Math.max(minIOBPredBG,minZTUAMPredBG));
+    }
+
+    // make sure minPredBG isn't higher than avgPredBG
+    minPredBG = Math.min( minPredBG, avgPredBG );
+
+    console.error("minPredBG: "+minPredBG+" minIOBPredBG: "+minIOBPredBG+" minZTGuardBG: "+minZTGuardBG);
+    if (minCOBPredBG < 999) {
+        console.error(" minCOBPredBG: "+minCOBPredBG);
+    }
+    if (minUAMPredBG < 999) {
+        console.error(" minUAMPredBG: "+minUAMPredBG);
+    }
+    console.error(" avgPredBG:",avgPredBG,"COB:",meal_data.mealCOB,"/",meal_data.carbs);
+    // But if the COB line falls off a cliff, don't trust UAM too much:
+    // use maxCOBPredBG if it's been set and lower than minPredBG
+    if ( maxCOBPredBG > bg ) {
+        minPredBG = Math.min(minPredBG, maxCOBPredBG);
+    }
+
+    rT.COB=meal_data.mealCOB;
+    rT.IOB=iob_data.iob;
+    rT.reason="COB: " + meal_data.mealCOB + ", Dev: " + convert_bg(deviation, profile) + ", BGI: " + convert_bg(bgi, profile) + ", ISF: " + convert_bg(sens, profile) + ", CR: " + round(profile.carb_ratio, 2) + ", Target: " + convert_bg(target_bg, profile) + ", minPredBG " + convert_bg(minPredBG, profile) + ", minGuardBG " + convert_bg(minGuardBG, profile) + ", IOBpredBG " + convert_bg(lastIOBpredBG, profile);
+    if (lastCOBpredBG > 0) {
+        rT.reason += ", COBpredBG " + convert_bg(lastCOBpredBG, profile);
+    }
+    if (lastUAMpredBG > 0) {
+        rT.reason += ", UAMpredBG " + convert_bg(lastUAMpredBG, profile)
+    }
+    rT.reason += "; ";
+    //var bgUndershoot = threshold - Math.min(minGuardBG, Math.max( naive_eventualBG, eventualBG ));
+    // use naive_eventualBG if above 40, but switch to minGuardBG if both eventualBGs hit floor of 39
+    //var carbsReqBG = Math.max( naive_eventualBG, eventualBG );
+    var carbsReqBG = naive_eventualBG;
+    if ( carbsReqBG < 40 ) {
+        carbsReqBG = Math.min( minGuardBG, carbsReqBG );
+    }
+    var bgUndershoot = threshold - carbsReqBG;
+    // calculate how long until COB (or IOB) predBGs drop below min_bg
+    var minutesAboveMinBG = 240;
+    var minutesAboveThreshold = 240;
+    if (meal_data.mealCOB > 0 && ( ci > 0 || remainingCIpeak > 0 )) {
+        for (var i=0; i<COBpredBGs.length; i++) {
+            //console.error(COBpredBGs[i], min_bg);
+            if ( COBpredBGs[i] < min_bg ) {
+                minutesAboveMinBG = 5*i;
+                break;
+            }
+        }
+        for (var i=0; i<COBpredBGs.length; i++) {
+            //console.error(COBpredBGs[i], threshold);
+            if ( COBpredBGs[i] < threshold ) {
+                minutesAboveThreshold = 5*i;
+                break;
+            }
+        }
+    } else {
+        for (var i=0; i<IOBpredBGs.length; i++) {
+            //console.error(IOBpredBGs[i], min_bg);
+            if ( IOBpredBGs[i] < min_bg ) {
+                minutesAboveMinBG = 5*i;
+                break;
+            }
+        }
+        for (var i=0; i<IOBpredBGs.length; i++) {
+            //console.error(IOBpredBGs[i], threshold);
+            if ( IOBpredBGs[i] < threshold ) {
+                minutesAboveThreshold = 5*i;
+                break;
+            }
+        }
+    }
+
+    if (enableSMB && minGuardBG < threshold) {
+        console.error("minGuardBG",convert_bg(minGuardBG, profile),"projected below", convert_bg(threshold, profile) ,"- disabling SMB");
+        //rT.reason += "minGuardBG "+minGuardBG+"<"+threshold+": SMB disabled; ";
+        enableSMB = false;
+    }
+    if ( maxDelta > 0.20 * bg ) {
+        console.error("maxDelta",convert_bg(maxDelta, profile),"> 20% of BG",convert_bg(bg, profile),"- disabling SMB");
+        rT.reason += "maxDelta "+convert_bg(maxDelta, profile)+" > 20% of BG "+convert_bg(bg, profile)+": SMB disabled; ";
+        enableSMB = false;
+    }
+
+    console.error("BG projected to remain above",convert_bg(min_bg, profile),"for",minutesAboveMinBG,"minutes");
+    if ( minutesAboveThreshold < 240 || minutesAboveMinBG < 60 ) {
+        console.error("BG projected to remain above",convert_bg(threshold,profile),"for",minutesAboveThreshold,"minutes");
+    }
+    // include at least minutesAboveMinBG worth of zero temps in calculating carbsReq
+    // always include at least 30m worth of zero temp (carbs to 80, low temp up to target)
+    //var zeroTempDuration = Math.max(30,minutesAboveMinBG);
+    var zeroTempDuration = minutesAboveThreshold;
+    // BG undershoot, minus effect of zero temps until hitting min_bg, converted to grams, minus COB
+    var zeroTempEffect = profile.current_basal*sens*zeroTempDuration/60;
+    // don't count the last 25% of COB against carbsReq
+    var COBforCarbsReq = Math.max(0, meal_data.mealCOB - 0.25*meal_data.carbs);
+    var carbsReq = (bgUndershoot - zeroTempEffect) / csf - COBforCarbsReq;
+    zeroTempEffect = round(zeroTempEffect);
+    carbsReq = round(carbsReq);
+    console.error("naive_eventualBG:",naive_eventualBG,"bgUndershoot:",bgUndershoot,"zeroTempDuration:",zeroTempDuration,"zeroTempEffect:",zeroTempEffect,"carbsReq:",carbsReq);
+    if ( carbsReq >= profile.carbsReqThreshold && minutesAboveThreshold <= 45 ) {
+        rT.carbsReq = carbsReq;
+        rT.reason += carbsReq + " add'l carbs req w/in " + minutesAboveThreshold + "m; ";
+    }
+    // don't low glucose suspend if IOB is already super negative and BG is rising faster than predicted
+    if (bg < threshold && iob_data.iob < -profile.current_basal*20/60 && minDelta > 0 && minDelta > expectedDelta) {
+        rT.reason += "IOB "+iob_data.iob+" < " + round(-profile.current_basal*20/60,2);
+        rT.reason += " and minDelta " + convert_bg(minDelta, profile) + " > " + "expectedDelta " + convert_bg(expectedDelta, profile) + "; ";
+    // predictive low glucose suspend mode: BG is / is projected to be < threshold
+    } else if ( bg < threshold || minGuardBG < threshold ) {
+        rT.reason += "minGuardBG " + convert_bg(minGuardBG, profile) + "<" + convert_bg(threshold, profile);
+        var bgUndershoot = target_bg - minGuardBG;
+        var worstCaseInsulinReq = bgUndershoot / sens;
+        var durationReq = round(60*worstCaseInsulinReq / profile.current_basal);
+        durationReq = round(durationReq/30)*30;
+        // always set a 30-120m zero temp (oref0-pump-loop will let any longer SMB zero temp run)
+        durationReq = Math.min(120,Math.max(30,durationReq));
+        return tempBasalFunctions.setTempBasal(0, durationReq, profile, rT, currenttemp);
+    }
+
+    if (eventualBG < min_bg) { // if eventual BG is below target:
+        rT.reason += "Eventual BG " + convert_bg(eventualBG, profile) + " < " + convert_bg(min_bg, profile);
+        // if 5m or 30m avg BG is rising faster than expected delta
+        if ( minDelta > expectedDelta && minDelta > 0 && !carbsReq ) {
+            // if naive_eventualBG < 40, set a 30m zero temp (oref0-pump-loop will let any longer SMB zero temp run)
+            if (naive_eventualBG < 40) {
+                rT.reason += ", naive_eventualBG < 40. ";
+                return tempBasalFunctions.setTempBasal(0, 30, profile, rT, currenttemp);
+            }
+            if (glucose_status.delta > minDelta) {
+                rT.reason += ", but Delta " + convert_bg(tick, profile) + " > expectedDelta " + convert_bg(expectedDelta, profile);
+            } else {
+                rT.reason += ", but Min. Delta " + minDelta.toFixed(2) + " > Exp. Delta " + convert_bg(expectedDelta, profile);
+            }
+            if (currenttemp.duration > 15 && (round_basal(basal, profile) === round_basal(currenttemp.rate, profile))) {
+                rT.reason += ", temp " + currenttemp.rate + " ~ req " + basal + "U/hr. ";
+                return rT;
+            } else {
+                rT.reason += "; setting current basal of " + basal + " as temp. ";
+                return tempBasalFunctions.setTempBasal(basal, 30, profile, rT, currenttemp);
+            }
+        }
+
+        // calculate 30m low-temp required to get projected BG up to target
+        // use snoozeBG to more gradually ramp in any counteraction of the user's boluses
+        // multiply by 2 to low-temp faster for increased hypo safety
+        //var insulinReq = 2 * Math.min(0, (snoozeBG - target_bg) / sens);
+        var insulinReq = 2 * Math.min(0, (eventualBG - target_bg) / sens);
+        insulinReq = round( insulinReq , 2);
+        // calculate naiveInsulinReq based on naive_eventualBG
+        var naiveInsulinReq = Math.min(0, (naive_eventualBG - target_bg) / sens);
+        naiveInsulinReq = round( naiveInsulinReq , 2);
+        if (minDelta < 0 && minDelta > expectedDelta) {
+            // if we're barely falling, newinsulinReq should be barely negative
+            //rT.reason += ", Snooze BG " + convert_bg(snoozeBG, profile);
+            var newinsulinReq = round(( insulinReq * (minDelta / expectedDelta) ), 2);
+            //console.error("Increasing insulinReq from " + insulinReq + " to " + newinsulinReq);
+            insulinReq = newinsulinReq;
+        }
+        // rate required to deliver insulinReq less insulin over 30m:
+        var rate = basal + (2 * insulinReq);
+        rate = round_basal(rate, profile);
+        // if required temp < existing temp basal
+        var insulinScheduled = currenttemp.duration * (currenttemp.rate - basal) / 60;
+        // if current temp would deliver a lot (30% of basal) less than the required insulin,
+        // by both normal and naive calculations, then raise the rate
+        var minInsulinReq = Math.min(insulinReq,naiveInsulinReq);
+        if (insulinScheduled < minInsulinReq - basal*0.3) {
+            rT.reason += ", "+currenttemp.duration + "m@" + (currenttemp.rate).toFixed(2) + " is a lot less than needed. ";
+            return tempBasalFunctions.setTempBasal(rate, 30, profile, rT, currenttemp);
+        }
+        if (typeof currenttemp.rate !== 'undefined' && (currenttemp.duration > 5 && rate >= currenttemp.rate * 0.8)) {
+            rT.reason += ", temp " + currenttemp.rate + " ~< req " + rate + "U/hr. ";
+            return rT;
+        } else {
+            // calculate a long enough zero temp to eventually correct back up to target
+            if ( rate <=0 ) {
+                var bgUndershoot = target_bg - naive_eventualBG;
+                var worstCaseInsulinReq = bgUndershoot / sens;
+                var durationReq = round(60*worstCaseInsulinReq / profile.current_basal);
+                if (durationReq < 0) {
+                    durationReq = 0;
+                // don't set a temp longer than 120 minutes
+                } else {
+                    durationReq = round(durationReq/30)*30;
+                    durationReq = Math.min(120,Math.max(0,durationReq));
+                }
+                //console.error(durationReq);
+                //rT.reason += "insulinReq " + insulinReq + "; "
+                if (durationReq > 0) {
+                    rT.reason += ", setting " + durationReq + "m zero temp. ";
+                    return tempBasalFunctions.setTempBasal(rate, durationReq, profile, rT, currenttemp);
+                }
+            } else {
+                rT.reason += ", setting " + rate + "U/hr. ";
+            }
+            return tempBasalFunctions.setTempBasal(rate, 30, profile, rT, currenttemp);
+        }
+    }
+
+    // if eventual BG is above min but BG is falling faster than expected Delta
+    if (minDelta < expectedDelta) {
+        // if in SMB mode, don't cancel SMB zero temp
+        if (! (microBolusAllowed && enableSMB)) {
+            if (glucose_status.delta < minDelta) {
+                rT.reason += "Eventual BG " + convert_bg(eventualBG, profile) + " > " + convert_bg(min_bg, profile) + " but Delta " + convert_bg(tick, profile) + " < Exp. Delta " + convert_bg(expectedDelta, profile);
+            } else {
+                rT.reason += "Eventual BG " + convert_bg(eventualBG, profile) + " > " + convert_bg(min_bg, profile) + " but Min. Delta " + minDelta.toFixed(2) + " < Exp. Delta " + convert_bg(expectedDelta, profile);
+            }
+            if (currenttemp.duration > 15 && (round_basal(basal, profile) === round_basal(currenttemp.rate, profile))) {
+                rT.reason += ", temp " + currenttemp.rate + " ~ req " + basal + "U/hr. ";
+                return rT;
+            } else {
+                rT.reason += "; setting current basal of " + basal + " as temp. ";
+                return tempBasalFunctions.setTempBasal(basal, 30, profile, rT, currenttemp);
+            }
+        }
+    }
+    // eventualBG or minPredBG is below max_bg
+    if (Math.min(eventualBG,minPredBG) < max_bg) {
+        // if in SMB mode, don't cancel SMB zero temp
+        if (! (microBolusAllowed && enableSMB )) {
+            rT.reason += convert_bg(eventualBG, profile)+"-"+convert_bg(minPredBG, profile)+" in range: no temp required";
+            if (currenttemp.duration > 15 && (round_basal(basal, profile) === round_basal(currenttemp.rate, profile))) {
+                rT.reason += ", temp " + currenttemp.rate + " ~ req " + basal + "U/hr. ";
+                return rT;
+            } else {
+                rT.reason += "; setting current basal of " + basal + " as temp. ";
+                return tempBasalFunctions.setTempBasal(basal, 30, profile, rT, currenttemp);
+            }
+        }
+    }
+
+    // eventual BG is at/above target
+    // if iob is over max, just cancel any temps
+    // if we're not here because of SMB, eventual BG is at/above target
+    if (! (microBolusAllowed && rT.COB)) {
+        rT.reason += "Eventual BG " + convert_bg(eventualBG, profile) + " >= " +  convert_bg(max_bg, profile) + ", ";
+    }
+    if (iob_data.iob > max_iob) {
+        rT.reason += "IOB " + round(iob_data.iob,2) + " > max_iob " + max_iob;
+        if (currenttemp.duration > 15 && (round_basal(basal, profile) === round_basal(currenttemp.rate, profile))) {
+            rT.reason += ", temp " + currenttemp.rate + " ~ req " + basal + "U/hr. ";
+            return rT;
+        } else {
+            rT.reason += "; setting current basal of " + basal + " as temp. ";
+            return tempBasalFunctions.setTempBasal(basal, 30, profile, rT, currenttemp);
+        }
+    } else { // otherwise, calculate 30m high-temp required to get projected BG down to target
+
+        // insulinReq is the additional insulin required to get minPredBG down to target_bg
+        //console.error(minPredBG,eventualBG);
+        //var insulinReq = round( (Math.min(minPredBG,eventualBG) - target_bg) / sens, 2);
+        var insulinReq = round( (Math.min(minPredBG,eventualBG) - target_bg) / sens, 2);
+        // when dropping, but not as fast as expected, reduce insulinReq proportionally
+        // to the what fraction of expectedDelta we're dropping at
+        //if (minDelta < 0 && minDelta > expectedDelta) {
+            //var newinsulinReq = round(( insulinReq * (1 - (minDelta / expectedDelta)) ), 2);
+            //console.error("Reducing insulinReq from " + insulinReq + " to " + newinsulinReq + " for minDelta " + minDelta + " vs. expectedDelta " + expectedDelta);
+            //insulinReq = newinsulinReq;
+        //}
+        // if that would put us over max_iob, then reduce accordingly
+        if (insulinReq > max_iob-iob_data.iob) {
+            rT.reason += "max_iob " + max_iob + ", ";
+            insulinReq = max_iob-iob_data.iob;
+        }
+
+        // rate required to deliver insulinReq more insulin over 30m:
+        var rate = basal + (2 * insulinReq);
+        rate = round_basal(rate, profile);
+        insulinReq = round(insulinReq,3);
+        rT.insulinReq = insulinReq;
+        //console.error(iob_data.lastBolusTime);
+        // minutes since last bolus
+        var lastBolusAge = round(( new Date().getTime() - iob_data.lastBolusTime ) / 60000,1);
+        //console.error(lastBolusAge);
+        //console.error(profile.temptargetSet, target_bg, rT.COB);
+        // only allow microboluses with COB or low temp targets, or within DIA hours of a bolus
+        if (microBolusAllowed && enableSMB && bg > threshold) {
+            // never bolus more than maxSMBBasalMinutes worth of basal
+            mealInsulinReq = round( meal_data.mealCOB / profile.carb_ratio ,3);
+            if (typeof profile.maxSMBBasalMinutes == 'undefined' ) {
+                maxBolus = round( profile.current_basal * 30 / 60 ,1);
+                console.error("profile.maxSMBBasalMinutes undefined: defaulting to 30m");
+            // if IOB covers more than COB, limit maxBolus to 30m of basal
+            } else if ( iob_data.iob > mealInsulinReq && iob_data.iob > 0 ) {
+                console.error("IOB",iob_data.iob,"> COB",meal_data.mealCOB+"; mealInsulinReq =",mealInsulinReq);
+                maxBolus = round( profile.current_basal * 30 / 60 ,1);
+            } else {
+                console.error("profile.maxSMBBasalMinutes:",profile.maxSMBBasalMinutes,"profile.current_basal:",profile.current_basal);
+                maxBolus = round( profile.current_basal * profile.maxSMBBasalMinutes / 60 ,1);
+            }
+            // bolus 1/2 the insulinReq, up to maxBolus, rounding down to nearest 0.1U
+            microBolus = Math.floor(Math.min(insulinReq/2,maxBolus)*10)/10;
+            // calculate a long enough zero temp to eventually correct back up to target
+            var smbTarget = target_bg;
+            var worstCaseInsulinReq = (smbTarget - (naive_eventualBG + minIOBPredBG)/2 ) / sens;
+            var durationReq = round(60*worstCaseInsulinReq / profile.current_basal);
+
+            // if insulinReq > 0 but not enough for a microBolus, don't set an SMB zero temp
+            if (insulinReq > 0 && microBolus < 0.1) {
+                durationReq = 0;
+            }
+
+            var smbLowTempReq = 0;
+            if (durationReq <= 0) {
+                durationReq = 0;
+            // don't set a temp longer than 120 minutes
+            } else if (durationReq >= 30) {
+                durationReq = round(durationReq/30)*30;
+                durationReq = Math.min(120,Math.max(0,durationReq));
+            } else {
+                // if SMB durationReq is less than 30m, set a nonzero low temp
+                smbLowTempReq = round( basal * durationReq/30 ,2);
+                durationReq = 30;
+            }
+            rT.reason += " insulinReq " + insulinReq;
+            if (microBolus >= maxBolus) {
+                rT.reason +=  "; maxBolus " + maxBolus;
+            }
+            if (durationReq > 0) {
+                rT.reason += "; setting " + durationReq + "m low temp of " + smbLowTempReq + "U/h";
+            }
+            rT.reason += ". ";
+
+            //allow SMBs every 3 minutes
+            var nextBolusMins = round(3-lastBolusAge,1);
+            //console.error(naive_eventualBG, insulinReq, worstCaseInsulinReq, durationReq);
+            console.error("naive_eventualBG",naive_eventualBG+",",durationReq+"m "+smbLowTempReq+"U/h temp needed; last bolus",lastBolusAge+"m ago; maxBolus: "+maxBolus);
+            if (lastBolusAge > 3) {
+                if (microBolus > 0) {
+                    rT.units = microBolus;
+                    rT.reason += "Microbolusing " + microBolus + "U. ";
+                }
+            } else {
+                rT.reason += "Waiting " + nextBolusMins + "m to microbolus again. ";
+            }
+            //rT.reason += ". ";
+
+            // if no zero temp is required, don't return yet; allow later code to set a high temp
+            if (durationReq > 0) {
+                rT.rate = smbLowTempReq;
+                rT.duration = durationReq;
+                return rT;
+            }
+
+            // if insulinReq is negative, snoozeBG > target_bg, and lastCOBpredBG > target_bg, set a neutral temp
+            //if (insulinReq < 0 && snoozeBG > target_bg && lastCOBpredBG > target_bg) {
+                //rT.reason += "; SMB bolus snooze: setting current basal of " + basal + " as temp. ";
+                //return tempBasalFunctions.setTempBasal(basal, 30, profile, rT, currenttemp);
+            //}
+        }
+
+        var maxSafeBasal = tempBasalFunctions.getMaxSafeBasal(profile);
+
+        if (rate > maxSafeBasal) {
+            rT.reason += "adj. req. rate: "+rate+" to maxSafeBasal: "+maxSafeBasal+", ";
+            rate = round_basal(maxSafeBasal, profile);
+        }
+
+        var insulinScheduled = currenttemp.duration * (currenttemp.rate - basal) / 60;
+        if (insulinScheduled >= insulinReq * 2) { // if current temp would deliver >2x more than the required insulin, lower the rate
+            rT.reason += currenttemp.duration + "m@" + (currenttemp.rate).toFixed(2) + " > 2 * insulinReq. Setting temp basal of " + rate + "U/hr. ";
+            return tempBasalFunctions.setTempBasal(rate, 30, profile, rT, currenttemp);
+        }
+
+        if (typeof currenttemp.duration == 'undefined' || currenttemp.duration == 0) { // no temp is set
+            rT.reason += "no temp, setting " + rate + "U/hr. ";
+            return tempBasalFunctions.setTempBasal(rate, 30, profile, rT, currenttemp);
+        }
+
+        if (currenttemp.duration > 5 && (round_basal(rate, profile) <= round_basal(currenttemp.rate, profile))) { // if required temp <~ existing temp basal
+            rT.reason += "temp " + currenttemp.rate + " >~ req " + rate + "U/hr. ";
+            return rT;
+        }
+
+        // required temp > existing temp basal
+        rT.reason += "temp " + currenttemp.rate + "<" + rate + "U/hr. ";
+        return tempBasalFunctions.setTempBasal(rate, 30, profile, rT, currenttemp);
+    }
+
+};
+
+module.exports = determine_basal;
diff --git a/app/src/main/java/info/nightscout/androidaps/Config.java b/app/src/main/java/info/nightscout/androidaps/Config.java
index 3c8d6095ed..6775b8dac6 100644
--- a/app/src/main/java/info/nightscout/androidaps/Config.java
+++ b/app/src/main/java/info/nightscout/androidaps/Config.java
@@ -24,6 +24,8 @@ public class Config {
     public static final boolean SMSCOMMUNICATORENABLED = !BuildConfig.NSCLIENTOLNY && !BuildConfig.G5UPLOADER;
 
 
+    public static final boolean displayDeviationSlope = true;
+
     public static final boolean detailedLog = true;
     public static final boolean logFunctionCalls = true;
     public static final boolean logIncommingData = true;
diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.java b/app/src/main/java/info/nightscout/androidaps/MainActivity.java
index b702897ba4..e77be36ba6 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.java
@@ -82,7 +82,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
                     Manifest.permission.WRITE_EXTERNAL_STORAGE}, CASE_STORAGE);
         }
         askForBatteryOptimizationPermission();
-        checkUpgradeToProfileTarget();
+        doMigrations();
         if (Config.logFunctionCalls)
             log.debug("onCreate");
 
@@ -163,6 +163,19 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         }
     }
 
+    private void doMigrations() {
+
+        checkUpgradeToProfileTarget();
+
+        // guarantee that the unreachable threshold is at least 30 and of type String
+        // Added in 1.57 at 21.01.2018
+        Integer unreachable_threshold = SP.getInt(R.string.key_pump_unreachable_threshold, 30);
+        SP.remove(R.string.key_pump_unreachable_threshold);
+        if(unreachable_threshold < 30) unreachable_threshold = 30;
+        SP.putString(R.string.key_pump_unreachable_threshold, unreachable_threshold.toString());
+    }
+
+
     private void checkUpgradeToProfileTarget() { // TODO: can be removed in the future
         boolean oldKeyExists = SP.contains("openapsma_min_bg");
         if (oldKeyExists) {
diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.java b/app/src/main/java/info/nightscout/androidaps/MainApp.java
index 44dbfa514e..ea037b362e 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java
@@ -44,6 +44,7 @@ import info.nightscout.androidaps.plugins.NSClientInternal.NSClientInternalPlugi
 import info.nightscout.androidaps.plugins.NSClientInternal.receivers.AckAlarmReceiver;
 import info.nightscout.androidaps.plugins.OpenAPSAMA.OpenAPSAMAPlugin;
 import info.nightscout.androidaps.plugins.OpenAPSMA.OpenAPSMAPlugin;
+import info.nightscout.androidaps.plugins.OpenAPSSMB.OpenAPSSMBPlugin;
 import info.nightscout.androidaps.plugins.Overview.OverviewPlugin;
 import info.nightscout.androidaps.plugins.Persistentnotification.PersistentNotificationPlugin;
 import info.nightscout.androidaps.plugins.ProfileCircadianPercentage.CircadianPercentageProfileFragment;
@@ -136,6 +137,7 @@ public class MainApp extends Application {
             if (Config.APS) pluginsList.add(LoopPlugin.getPlugin());
             if (Config.APS) pluginsList.add(OpenAPSMAPlugin.getPlugin());
             if (Config.APS) pluginsList.add(OpenAPSAMAPlugin.getPlugin());
+            if (Config.APS) pluginsList.add(OpenAPSSMBPlugin.getPlugin());
             pluginsList.add(NSProfilePlugin.getPlugin());
             if (Config.OTHERPROFILES) pluginsList.add(SimpleProfilePlugin.getPlugin());
             if (Config.OTHERPROFILES) pluginsList.add(LocalProfilePlugin.getPlugin());
@@ -235,6 +237,10 @@ public class MainApp extends Application {
         return sResources.getString(id);
     }
 
+    public static String gs(int id, Object... args) {
+        return sResources.getString(id, args);
+    }
+
     public static MainApp instance() {
         return sInstance;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java b/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
index 5a0d84d1f7..ae3982ad68 100644
--- a/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
@@ -16,6 +16,7 @@ import android.text.TextUtils;
 import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.events.EventRefreshGui;
 import info.nightscout.androidaps.interfaces.PluginBase;
+import info.nightscout.androidaps.plugins.OpenAPSSMB.OpenAPSSMBPlugin;
 import info.nightscout.androidaps.plugins.Careportal.CareportalPlugin;
 import info.nightscout.androidaps.plugins.ConstraintsSafety.SafetyPlugin;
 import info.nightscout.androidaps.plugins.Insulin.InsulinOrefFreePeakPlugin;
@@ -145,6 +146,7 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
                     addPreferencesFromResourceIfEnabled(LoopPlugin.getPlugin(), PluginBase.LOOP);
                     addPreferencesFromResourceIfEnabled(OpenAPSMAPlugin.getPlugin(), PluginBase.APS);
                     addPreferencesFromResourceIfEnabled(OpenAPSAMAPlugin.getPlugin(), PluginBase.APS);
+                    addPreferencesFromResourceIfEnabled(OpenAPSSMBPlugin.getPlugin(), PluginBase.APS);
                 }
 
                 addPreferencesFromResourceIfEnabled(SensitivityAAPSPlugin.getPlugin(), PluginBase.SENSITIVITY);
diff --git a/app/src/main/java/info/nightscout/androidaps/Services/AlarmSoundService.java b/app/src/main/java/info/nightscout/androidaps/Services/AlarmSoundService.java
index 60dd92a2c1..f453b04d36 100644
--- a/app/src/main/java/info/nightscout/androidaps/Services/AlarmSoundService.java
+++ b/app/src/main/java/info/nightscout/androidaps/Services/AlarmSoundService.java
@@ -1,8 +1,10 @@
 package info.nightscout.androidaps.Services;
 
 import android.app.Service;
+import android.content.Context;
 import android.content.Intent;
 import android.content.res.AssetFileDescriptor;
+import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.os.IBinder;
 
@@ -53,7 +55,10 @@ public class AlarmSoundService extends Service {
             log.error("Unhandled exception", e);
         }
         player.setLooping(true); // Set looping
-        player.setVolume(100, 100);
+        AudioManager manager = (AudioManager)this.getSystemService(Context.AUDIO_SERVICE);
+        if (manager == null || !manager.isMusicActive()) {
+            player.setVolume(100, 100);
+        }
 
         try {
             player.prepare();
diff --git a/app/src/main/java/info/nightscout/androidaps/Services/DataService.java b/app/src/main/java/info/nightscout/androidaps/Services/DataService.java
index e4d65eadc0..b242c4c099 100644
--- a/app/src/main/java/info/nightscout/androidaps/Services/DataService.java
+++ b/app/src/main/java/info/nightscout/androidaps/Services/DataService.java
@@ -15,20 +15,22 @@ import org.slf4j.LoggerFactory;
 import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.events.EventNewBasalProfile;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ConstraintsObjectives.ObjectivesPlugin;
+import info.nightscout.androidaps.plugins.NSClientInternal.data.NSDeviceStatus;
 import info.nightscout.androidaps.plugins.NSClientInternal.data.NSMbg;
-import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSgv;
-import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSettingsStatus;
-import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
+import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSgv;
 import info.nightscout.androidaps.plugins.Overview.OverviewPlugin;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.ProfileNS.NSProfilePlugin;
+import info.nightscout.androidaps.plugins.ProfileNS.events.EventNSProfileUpdateGUI;
 import info.nightscout.androidaps.plugins.PumpDanaR.activities.DanaRNSHistorySync;
 import info.nightscout.androidaps.plugins.SmsCommunicator.events.EventNewSMS;
 import info.nightscout.androidaps.plugins.SourceDexcomG5.SourceDexcomG5Plugin;
@@ -37,7 +39,6 @@ import info.nightscout.androidaps.plugins.SourceMM640g.SourceMM640gPlugin;
 import info.nightscout.androidaps.plugins.SourceNSClient.SourceNSClientPlugin;
 import info.nightscout.androidaps.plugins.SourceXdrip.SourceXdripPlugin;
 import info.nightscout.androidaps.receivers.DataReceiver;
-import info.nightscout.androidaps.plugins.NSClientInternal.data.NSDeviceStatus;
 import info.nightscout.utils.BundleLogger;
 import info.nightscout.utils.NSUpload;
 import info.nightscout.utils.SP;
@@ -365,8 +366,10 @@ public class DataService extends IntentService {
                 String profile = bundles.getString("profile");
                 ProfileStore profileStore = new ProfileStore(new JSONObject(profile));
                 NSProfilePlugin.storeNewProfile(profileStore);
-                MainApp.bus().post(new EventNewBasalProfile());
-
+                MainApp.bus().post(new EventNSProfileUpdateGUI());
+                // if there are no profile switches this should lead to profile update
+                if (MainApp.getConfigBuilder().getProfileSwitchesFromHistory().size() == 0)
+                    MainApp.bus().post(new EventNewBasalProfile());
                 if (Config.logIncommingData)
                     log.debug("Received profileStore: " + activeProfile + " " + profile);
             } catch (JSONException e) {
diff --git a/app/src/main/java/info/nightscout/androidaps/data/DetailedBolusInfo.java b/app/src/main/java/info/nightscout/androidaps/data/DetailedBolusInfo.java
index 7720b03d3e..7d1dcac9ad 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/DetailedBolusInfo.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/DetailedBolusInfo.java
@@ -29,6 +29,7 @@ public class DetailedBolusInfo {
     public Context context = null;         // context for progress dialog
     public long pumpId = 0;                // id of record if comming from pump history (not a newly created treatment)
     public boolean isSMB = false;          // is a Super-MicroBolus
+    public long deliverAt = 0;             // SMB should be delivered within 1 min from this time
 
     @Override
     public String toString() {
@@ -37,6 +38,7 @@ public class DetailedBolusInfo {
                 " carbs: " + carbs +
                 " isValid: " + isValid +
                 " carbTime: " + carbTime +
-                " isSMB: " + isSMB;
+                " isSMB: " + isSMB +
+                " deliverAt: " + new Date(deliverAt).toLocaleString();
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/data/GlucoseStatus.java b/app/src/main/java/info/nightscout/androidaps/data/GlucoseStatus.java
index ad4f161799..1a5094253f 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/GlucoseStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/GlucoseStatus.java
@@ -35,6 +35,7 @@ public class GlucoseStatus {
     public double avgdelta = 0d;
     public double short_avgdelta = 0d;
     public double long_avgdelta = 0d;
+    public long date = 0L;
 
 
     @Override
@@ -133,6 +134,7 @@ public class GlucoseStatus {
 
         GlucoseStatus status = new GlucoseStatus();
         status.glucose = now.value;
+        status.date = now_date;
 
         status.short_avgdelta = average(short_deltas);
 
diff --git a/app/src/main/java/info/nightscout/androidaps/data/Iob.java b/app/src/main/java/info/nightscout/androidaps/data/Iob.java
index ee70699604..762352782b 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/Iob.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/Iob.java
@@ -12,4 +12,26 @@ public class Iob {
         activityContrib += iob.activityContrib;
         return this;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Iob iob = (Iob) o;
+
+        if (Double.compare(iob.iobContrib, iobContrib) != 0) return false;
+        return Double.compare(iob.activityContrib, activityContrib) == 0;
+    }
+
+    @Override
+    public int hashCode() {
+        int result;
+        long temp;
+        temp = Double.doubleToLongBits(iobContrib);
+        result = (int) (temp ^ (temp >>> 32));
+        temp = Double.doubleToLongBits(activityContrib);
+        result = 31 * result + (int) (temp ^ (temp >>> 32));
+        return result;
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/data/IobTotal.java b/app/src/main/java/info/nightscout/androidaps/data/IobTotal.java
index 3240e79327..4bb55b0095 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/IobTotal.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/IobTotal.java
@@ -21,8 +21,11 @@ public class IobTotal {
     public double hightempinsulin;
 
     // oref1
-    public double microBolusInsulin;
-    public double microBolusIOB;
+    public long lastBolusTime;
+    public long lastTempDate;
+    public int lastTempDuration;
+    public double lastTempRate;
+    public IobTotal iobWithZeroTemp;
 
     public double netInsulin = 0d; // for calculations from temp basals only
     public double netRatio = 0d; // net ratio at start of temp basal
@@ -31,6 +34,23 @@ public class IobTotal {
 
     long time;
 
+
+    public IobTotal clone() {
+        IobTotal copy = new IobTotal(time);
+        copy.iob = iob;
+        copy.activity = activity;
+        copy.bolussnooze = bolussnooze;
+        copy.basaliob = basaliob;
+        copy.netbasalinsulin = netbasalinsulin;
+        copy.hightempinsulin = hightempinsulin;
+        copy.lastBolusTime = lastBolusTime;
+        copy.lastTempDate = lastTempDate;
+        copy.lastTempDuration = lastTempDuration;
+        copy.lastTempRate = lastTempRate;
+        copy.iobWithZeroTemp = iobWithZeroTemp;
+        return copy;
+    }
+
     public IobTotal(long time) {
         this.iob = 0d;
         this.activity = 0d;
@@ -38,8 +58,7 @@ public class IobTotal {
         this.basaliob = 0d;
         this.netbasalinsulin = 0d;
         this.hightempinsulin = 0d;
-        this.microBolusInsulin = 0d;
-        this.microBolusIOB = 0d;
+        this.lastBolusTime = 0;
         this.time = time;
     }
 
@@ -52,8 +71,6 @@ public class IobTotal {
         hightempinsulin += other.hightempinsulin;
         netInsulin += other.netInsulin;
         extendedBolusInsulin += other.extendedBolusInsulin;
-        microBolusInsulin += other.microBolusInsulin;
-        microBolusIOB += other.microBolusIOB;
         return this;
     }
 
@@ -62,11 +79,14 @@ public class IobTotal {
         result.iob = bolusIOB.iob + basalIob.basaliob;
         result.activity = bolusIOB.activity + basalIob.activity;
         result.bolussnooze = bolusIOB.bolussnooze;
-        result.basaliob = basalIob.basaliob;
-        result.netbasalinsulin = basalIob.netbasalinsulin;
-        result.hightempinsulin = basalIob.hightempinsulin;
-        result.microBolusInsulin = bolusIOB.microBolusInsulin + basalIob.microBolusInsulin;
-        result.microBolusIOB = bolusIOB.microBolusIOB + basalIob.microBolusIOB;
+        result.basaliob = bolusIOB.basaliob + basalIob.basaliob;
+        result.netbasalinsulin = bolusIOB.netbasalinsulin + basalIob.netbasalinsulin;
+        result.hightempinsulin = basalIob.hightempinsulin + bolusIOB.hightempinsulin;
+        result.lastBolusTime = bolusIOB.lastBolusTime;
+        result.lastTempDate = basalIob.lastTempDate;
+        result.lastTempRate = basalIob.lastTempRate;
+        result.lastTempDuration = basalIob.lastTempDuration;
+        result.iobWithZeroTemp = basalIob.iobWithZeroTemp;
         return result;
     }
 
@@ -77,8 +97,6 @@ public class IobTotal {
         this.basaliob = Round.roundTo(this.basaliob, 0.001);
         this.netbasalinsulin = Round.roundTo(this.netbasalinsulin, 0.001);
         this.hightempinsulin = Round.roundTo(this.hightempinsulin, 0.001);
-        this.microBolusInsulin = Round.roundTo(this.microBolusInsulin, 0.001);
-        this.microBolusIOB = Round.roundTo(this.microBolusIOB, 0.001);
         return this;
     }
 
@@ -102,7 +120,24 @@ public class IobTotal {
             json.put("basaliob", basaliob);
             json.put("bolussnooze", bolussnooze);
             json.put("activity", activity);
+            json.put("lastBolusTime", lastBolusTime);
             json.put("time", DateUtil.toISOString(new Date(time)));
+            /*
+
+            This is requested by SMB determine_basal but by based on Scott's info
+            it's MDT specific safety check only
+            It's causing rounding issues in determine_basal
+
+            JSONObject lastTemp = new JSONObject();
+            lastTemp.put("date", lastTempDate);
+            lastTemp.put("rate", lastTempRate);
+            lastTemp.put("duration", lastTempDuration);
+            json.put("lastTemp", lastTemp);
+            */
+            if (iobWithZeroTemp != null) {
+                JSONObject iwzt = iobWithZeroTemp.determineBasalJson();
+                json.put("iobWithZeroTemp", iwzt);
+            }
         } catch (JSONException e) {
             log.error("Unhandled exception", e);
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/data/MealData.java b/app/src/main/java/info/nightscout/androidaps/data/MealData.java
index 292d2272d5..054c76d602 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/MealData.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/MealData.java
@@ -7,4 +7,8 @@ public class MealData {
     public double boluses = 0d;
     public double carbs = 0d;
     public double mealCOB = 0.0d;
+    public double slopeFromMaxDeviation = 0;
+    public double slopeFromMinDeviation = 999;
+    public long lastBolusTime;
+    public long lastCarbTime = 0L;
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/data/Profile.java b/app/src/main/java/info/nightscout/androidaps/data/Profile.java
index 5235545362..7bb693ef23 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/Profile.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/Profile.java
@@ -239,6 +239,7 @@ public class Profile {
                 // if pump not available (at start)
                 // do not store converted array
                 basal_v = null;
+                isValidated = false;
             }
 
          }
diff --git a/app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java b/app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java
index c50166d5a4..d19b3316ac 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java
@@ -57,6 +57,10 @@ public class PumpEnactResult extends Object {
         return this;
     }
 
+    public PumpEnactResult percent(Integer percent) {
+        this.percent = percent;
+        return this;
+    }
     public PumpEnactResult isPercent(boolean isPercent) {
         this.isPercent = isPercent;
         return this;
@@ -111,7 +115,7 @@ public class PumpEnactResult extends Object {
     }
 
     public Spanned toSpanned() {
-        String ret = MainApp.sResources.getString(R.string.success) + ": " + success;
+        String ret = "<b>" + MainApp.sResources.getString(R.string.success) + "</b>: " + success;
         if (queued) {
             ret = MainApp.sResources.getString(R.string.waitingforpumpresult);
         } else if (enacted) {
@@ -119,17 +123,20 @@ public class PumpEnactResult extends Object {
                 ret += "<br><b>" + MainApp.sResources.getString(R.string.enacted) + "</b>: " + enacted;
                 ret += "<br><b>" + MainApp.sResources.getString(R.string.comment) + "</b>: " + comment +
                         "<br>" + MainApp.sResources.getString(R.string.canceltemp);
-            } else if (isPercent) {
+            } else if (isPercent && percent != -1) {
                 ret += "<br><b>" + MainApp.sResources.getString(R.string.enacted) + "</b>: " + enacted;
                 ret += "<br><b>" + MainApp.sResources.getString(R.string.comment) + "</b>: " + comment;
                 ret += "<br><b>" + MainApp.sResources.getString(R.string.duration) + "</b>: " + duration + " min";
                 ret += "<br><b>" + MainApp.sResources.getString(R.string.percent) + "</b>: " + percent + "%";
-            } else {
+            } else if (absolute != -1) {
                 ret += "<br><b>" + MainApp.sResources.getString(R.string.enacted) + "</b>: " + enacted;
                 ret += "<br><b>" + MainApp.sResources.getString(R.string.comment) + "</b>: " + comment;
                 ret += "<br><b>" + MainApp.sResources.getString(R.string.duration) + "</b>: " + duration + " min";
                 ret += "<br><b>" + MainApp.sResources.getString(R.string.absolute) + "</b>: " + DecimalFormatter.to2Decimal(absolute) + " U/h";
             }
+            if (bolusDelivered > 0) {
+                ret += "<br><b>" + MainApp.sResources.getString(R.string.bolus) + "</b>: " + DecimalFormatter.to2Decimal(bolusDelivered) + " U";
+            }
         } else {
             ret += "<br><b>" + MainApp.sResources.getString(R.string.comment) + "</b>: " + comment;
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/db/BgReading.java b/app/src/main/java/info/nightscout/androidaps/db/BgReading.java
index c8d5295811..e842979ecb 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/BgReading.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/BgReading.java
@@ -17,7 +17,6 @@ import info.nightscout.androidaps.plugins.NSClientInternal.data.NSSgv;
 import info.nightscout.androidaps.plugins.Overview.OverviewPlugin;
 import info.nightscout.androidaps.plugins.Overview.graphExtensions.DataPointWithLabelInterface;
 import info.nightscout.androidaps.plugins.Overview.graphExtensions.PointsWithLabelGraphSeries;
-import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.DecimalFormatter;
 import info.nightscout.utils.SP;
 
@@ -43,7 +42,11 @@ public class BgReading implements DataPointWithLabelInterface {
     @DatabaseField
     public String _id = null; // NS _id
 
-    public boolean isPrediction = false; // true when drawing predictions as bg points
+    public boolean isCOBPrediction = false; // true when drawing predictions as bg points (COB)
+    public boolean isaCOBPrediction = false; // true when drawing predictions as bg points (aCOB)
+    public boolean isIOBPrediction = false; // true when drawing predictions as bg points (IOB)
+    public boolean isUAMPrediction = false; // true when drawing predictions as bg points (UAM)
+    public boolean isZTPrediction = false; // true when drawing predictions as bg points (ZT)
 
     public BgReading() {
     }
@@ -184,7 +187,10 @@ public class BgReading implements DataPointWithLabelInterface {
 
     @Override
     public PointsWithLabelGraphSeries.Shape getShape() {
-        return PointsWithLabelGraphSeries.Shape.POINT;
+        if (isPrediction())
+            return PointsWithLabelGraphSeries.Shape.PREDICTION;
+        else
+            return PointsWithLabelGraphSeries.Shape.BG;
     }
 
     @Override
@@ -205,7 +211,7 @@ public class BgReading implements DataPointWithLabelInterface {
             highLine = Profile.fromMgdlToUnits(OverviewPlugin.bgTargetHigh, units);
         }
         int color = MainApp.sResources.getColor(R.color.inrange);
-        if (isPrediction)
+        if (isPrediction())
             color = MainApp.sResources.getColor(R.color.prediction);
         else if (valueToUnits(units) < lowLine)
             color = MainApp.sResources.getColor(R.color.low);
@@ -214,4 +220,23 @@ public class BgReading implements DataPointWithLabelInterface {
         return color;
     }
 
+    @Override
+    public int getSecondColor() {
+        if (isIOBPrediction)
+            return MainApp.sResources.getColor(R.color.iob);
+        if (isCOBPrediction)
+            return MainApp.sResources.getColor(R.color.cob);
+        if (isaCOBPrediction)
+            return 0x80FFFFFF & MainApp.sResources.getColor(R.color.cob);
+        if (isUAMPrediction)
+            return MainApp.sResources.getColor(R.color.uam);
+        if (isZTPrediction)
+            return MainApp.sResources.getColor(R.color.zt);
+        return R.color.mdtp_white;
+    }
+
+    private boolean isPrediction() {
+        return isaCOBPrediction || isCOBPrediction || isIOBPrediction || isUAMPrediction || isZTPrediction;
+    }
+
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java b/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
index b80f4f932e..9f49b64280 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
@@ -191,6 +191,17 @@ public class CareportalEvent implements DataPointWithLabelInterface {
         return Translator.translate(eventType);
     }
 
+    public String getNotes() {
+        try {
+            JSONObject object = new JSONObject(json);
+            if (object.has("notes"))
+                return object.getString("notes");
+        } catch (JSONException e) {
+            log.error("Unhandled exception", e);
+        }
+        return "";
+    }
+
     @Override
     public long getDuration() {
         try {
@@ -242,4 +253,9 @@ public class CareportalEvent implements DataPointWithLabelInterface {
             return Color.GRAY;
         return Color.GRAY;
     }
+
+    @Override
+    public int getSecondColor() {
+        return 0;
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
index 69bc542dae..fe59b49137 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
@@ -225,9 +225,9 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             log.error("Unhandled exception", e);
         }
         VirtualPumpPlugin.setFakingStatus(true);
-        scheduleBgChange(); // trigger refresh
+        scheduleBgChange(null); // trigger refresh
         scheduleTemporaryBasalChange();
-        scheduleTreatmentChange();
+        scheduleTreatmentChange(null);
         scheduleExtendedBolusChange();
         scheduleTemporaryTargetChange();
         scheduleCareportalEventChange();
@@ -252,7 +252,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         } catch (SQLException e) {
             log.error("Unhandled exception", e);
         }
-        scheduleTreatmentChange();
+        scheduleTreatmentChange(null);
     }
 
     public void resetTempTargets() {
@@ -358,7 +358,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             if (old == null) {
                 getDaoBgReadings().create(bgReading);
                 log.debug("BG: New record from: " + from + " " + bgReading.toString());
-                scheduleBgChange();
+                scheduleBgChange(bgReading);
                 return true;
             }
             if (!old.isEqual(bgReading)) {
@@ -366,7 +366,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 old.copyFrom(bgReading);
                 getDaoBgReadings().update(old);
                 log.debug("BG: Updating record from: " + from + " New data: " + old.toString());
-                scheduleBgChange();
+                scheduleBgChange(bgReading);
                 return false;
             }
         } catch (SQLException e) {
@@ -384,11 +384,11 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         }
     }
 
-    private static void scheduleBgChange() {
+    private static void scheduleBgChange(@Nullable final BgReading bgReading) {
         class PostRunnable implements Runnable {
             public void run() {
                 log.debug("Firing EventNewBg");
-                MainApp.bus().post(new EventNewBG());
+                MainApp.bus().post(new EventNewBG(bgReading));
                 scheduledBgPost = null;
             }
         }
@@ -507,7 +507,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         return 0;
     }
 
-    public int deleteDbRequestbyMongoId(String action, String id) {
+    public void deleteDbRequestbyMongoId(String action, String id) {
         try {
             QueryBuilder<DbRequest, String> queryBuilder = getDaoDbRequest().queryBuilder();
             Where where = queryBuilder.where();
@@ -515,16 +515,13 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             queryBuilder.limit(10L);
             PreparedQuery<DbRequest> preparedQuery = queryBuilder.prepare();
             List<DbRequest> dbList = getDaoDbRequest().query(preparedQuery);
-            if (dbList.size() != 1) {
-                log.error("deleteDbRequestbyMongoId query size: " + dbList.size());
-            } else {
-                //log.debug("Treatment findTreatmentById found: " + trList.get(0).log());
-                return delete(dbList.get(0));
+            log.error("deleteDbRequestbyMongoId query size: " + dbList.size());
+            for (DbRequest r : dbList) {
+                delete(r);
             }
         } catch (SQLException e) {
             log.error("Unhandled exception", e);
         }
-        return 0;
     }
 
     public void deleteAllDbRequests() {
@@ -566,7 +563,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 getDaoTreatments().create(treatment);
                 log.debug("TREATMENT: New record from: " + Source.getString(treatment.source) + " " + treatment.toString());
                 updateEarliestDataChange(treatment.date);
-                scheduleTreatmentChange();
+                scheduleTreatmentChange(treatment);
                 return true;
             }
             if (treatment.source == Source.NIGHTSCOUT) {
@@ -583,7 +580,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                             updateEarliestDataChange(oldDate);
                             updateEarliestDataChange(old.date);
                         }
-                        scheduleTreatmentChange();
+                        scheduleTreatmentChange(treatment);
                         return true;
                     }
                     return false;
@@ -608,7 +605,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                                 updateEarliestDataChange(oldDate);
                                 updateEarliestDataChange(old.date);
                             }
-                            scheduleTreatmentChange();
+                            scheduleTreatmentChange(treatment);
                             return true;
                         }
                     }
@@ -616,14 +613,14 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 getDaoTreatments().create(treatment);
                 log.debug("TREATMENT: New record from: " + Source.getString(treatment.source) + " " + treatment.toString());
                 updateEarliestDataChange(treatment.date);
-                scheduleTreatmentChange();
+                scheduleTreatmentChange(treatment);
                 return true;
             }
             if (treatment.source == Source.USER) {
                 getDaoTreatments().create(treatment);
                 log.debug("TREATMENT: New record from: " + Source.getString(treatment.source) + " " + treatment.toString());
                 updateEarliestDataChange(treatment.date);
-                scheduleTreatmentChange();
+                scheduleTreatmentChange(treatment);
                 return true;
             }
         } catch (SQLException e) {
@@ -639,7 +636,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         } catch (SQLException e) {
             log.error("Unhandled exception", e);
         }
-        scheduleTreatmentChange();
+        scheduleTreatmentChange(treatment);
     }
 
     public void update(Treatment treatment) {
@@ -649,7 +646,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         } catch (SQLException e) {
             log.error("Unhandled exception", e);
         }
-        scheduleTreatmentChange();
+        scheduleTreatmentChange(treatment);
     }
 
     public void deleteTreatmentById(String _id) {
@@ -658,12 +655,12 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             log.debug("TREATMENT: Removing Treatment record from database: " + stored.toString());
             delete(stored);
             updateEarliestDataChange(stored.date);
-            scheduleTreatmentChange();
+            scheduleTreatmentChange(null);
         }
     }
 
     @Nullable
-    public Treatment findTreatmentById(String _id) {
+    private Treatment findTreatmentById(String _id) {
         try {
             Dao<Treatment, Long> daoTreatments = getDaoTreatments();
             QueryBuilder<Treatment, Long> queryBuilder = daoTreatments.queryBuilder();
@@ -695,11 +692,11 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         }
     }
 
-    private static void scheduleTreatmentChange() {
+    private static void scheduleTreatmentChange(@Nullable final Treatment treatment) {
         class PostRunnable implements Runnable {
             public void run() {
                 log.debug("Firing EventTreatmentChange");
-                MainApp.bus().post(new EventReloadTreatmentData(new EventTreatmentChange()));
+                MainApp.bus().post(new EventReloadTreatmentData(new EventTreatmentChange(treatment)));
                 if (earliestDataChange != null)
                     MainApp.bus().post(new EventNewHistoryData(earliestDataChange));
                 earliestDataChange = null;
@@ -1473,7 +1470,21 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         } catch (SQLException e) {
             log.error("Unhandled exception", e);
         }
-        return new ArrayList<CareportalEvent>();
+        return new ArrayList<>();
+    }
+
+    public List<CareportalEvent> getCareportalEventsFromTime(boolean ascending) {
+        try {
+            List<CareportalEvent> careportalEvents;
+            QueryBuilder<CareportalEvent, Long> queryBuilder = getDaoCareportalEvents().queryBuilder();
+            queryBuilder.orderBy("date", ascending);
+            PreparedQuery<CareportalEvent> preparedQuery = queryBuilder.prepare();
+            careportalEvents = getDaoCareportalEvents().query(preparedQuery);
+            return careportalEvents;
+        } catch (SQLException e) {
+            log.error("Unhandled exception", e);
+        }
+        return new ArrayList<>();
     }
 
     public void deleteCareportalEventById(String _id) {
@@ -1731,4 +1742,4 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
     }
 
     // ---------------- Food handling ---------------
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java b/app/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java
index 4232a2fc86..7bd60fe496 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java
@@ -285,4 +285,9 @@ public class ExtendedBolus implements Interval, DataPointWithLabelInterface {
     public int getColor() {
         return Color.CYAN;
     }
+
+    @Override
+    public int getSecondColor() {
+        return 0;
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/db/FoodHelper.java b/app/src/main/java/info/nightscout/androidaps/db/FoodHelper.java
index 992e328532..a933c2166e 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/FoodHelper.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/FoodHelper.java
@@ -70,7 +70,7 @@ public class FoodHelper {
     public boolean createOrUpdate(Food food) {
         try {
             // find by NS _id
-            if (food._id != null) {
+            if (food._id != null && !food._id.equals("")) {
                 Food old;
 
                 QueryBuilder<Food, Long> queryBuilder = getDaoFood().queryBuilder();
@@ -90,12 +90,13 @@ public class FoodHelper {
                     } else {
                         return false;
                     }
+                } else {
+                    getDaoFood().createOrUpdate(food);
+                    log.debug("FOOD: New record: " + food.toString());
+                    scheduleFoodChange();
+                    return true;
                 }
             }
-            getDaoFood().createOrUpdate(food);
-            log.debug("FOOD: New record: " + food.toString());
-            scheduleFoodChange();
-            return true;
         } catch (SQLException e) {
             log.error("Unhandled exception", e);
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java b/app/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java
index dcce69639f..ba2f2758e2 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java
@@ -238,6 +238,11 @@ public class ProfileSwitch implements Interval, DataPointWithLabelInterface {
         return Color.CYAN;
     }
 
+    @Override
+    public int getSecondColor() {
+        return 0;
+    }
+
     public String toString() {
         return "ProfileSwitch{" +
                 "date=" + date +
diff --git a/app/src/main/java/info/nightscout/androidaps/db/Treatment.java b/app/src/main/java/info/nightscout/androidaps/db/Treatment.java
index 9de76e6bf8..78e1fb6282 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/Treatment.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/Treatment.java
@@ -12,6 +12,7 @@ import java.util.Objects;
 
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Iob;
 import info.nightscout.androidaps.interfaces.InsulinInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
@@ -139,7 +140,10 @@ public class Treatment implements DataPointWithLabelInterface {
 
     @Override
     public PointsWithLabelGraphSeries.Shape getShape() {
-        return PointsWithLabelGraphSeries.Shape.BOLUS;
+        if (isSMB)
+            return PointsWithLabelGraphSeries.Shape.SMB;
+        else
+            return PointsWithLabelGraphSeries.Shape.BOLUS;
     }
 
     @Override
@@ -149,12 +153,19 @@ public class Treatment implements DataPointWithLabelInterface {
 
     @Override
     public int getColor() {
-        if (isValid)
+        if (isSMB)
+            return MainApp.sResources.getColor(R.color.tempbasal);
+        else if (isValid)
             return Color.CYAN;
         else
             return MainApp.instance().getResources().getColor(android.R.color.holo_red_light);
     }
 
+    @Override
+    public int getSecondColor() {
+        return 0;
+    }
+
     @Override
     public void setY(double y) {
         yValue = y;
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventAppInitialized.java b/app/src/main/java/info/nightscout/androidaps/events/EventAppInitialized.java
new file mode 100644
index 0000000000..17262cfb85
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/events/EventAppInitialized.java
@@ -0,0 +1,8 @@
+package info.nightscout.androidaps.events;
+
+/**
+ * Created by mike on 23.01.2018.
+ */
+
+public class EventAppInitialized extends Event {
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventNewBG.java b/app/src/main/java/info/nightscout/androidaps/events/EventNewBG.java
index 2fb9919b00..dc4d434e0a 100644
--- a/app/src/main/java/info/nightscout/androidaps/events/EventNewBG.java
+++ b/app/src/main/java/info/nightscout/androidaps/events/EventNewBG.java
@@ -1,7 +1,17 @@
 package info.nightscout.androidaps.events;
 
+import android.support.annotation.Nullable;
+
+import info.nightscout.androidaps.db.BgReading;
+
 /**
  * Created by mike on 05.06.2016.
  */
 public class EventNewBG extends EventLoop {
+    @Nullable
+    public final BgReading bgReading;
+
+    public EventNewBG(BgReading bgReading) {
+        this.bgReading = bgReading;
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventTreatmentChange.java b/app/src/main/java/info/nightscout/androidaps/events/EventTreatmentChange.java
index 439d9a7124..2a3581f9bf 100644
--- a/app/src/main/java/info/nightscout/androidaps/events/EventTreatmentChange.java
+++ b/app/src/main/java/info/nightscout/androidaps/events/EventTreatmentChange.java
@@ -1,7 +1,17 @@
 package info.nightscout.androidaps.events;
 
+import android.support.annotation.Nullable;
+
+import info.nightscout.androidaps.db.Treatment;
+
 /**
  * Created by mike on 04.06.2016.
  */
 public class EventTreatmentChange extends EventLoop {
+    @Nullable
+    public final Treatment treatment;
+
+    public EventTreatmentChange(Treatment treatment) {
+        this.treatment = treatment;
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/BgSourceInterface.java b/app/src/main/java/info/nightscout/androidaps/interfaces/BgSourceInterface.java
index 7ecc89ef66..a45ab083e7 100644
--- a/app/src/main/java/info/nightscout/androidaps/interfaces/BgSourceInterface.java
+++ b/app/src/main/java/info/nightscout/androidaps/interfaces/BgSourceInterface.java
@@ -4,4 +4,5 @@ package info.nightscout.androidaps.interfaces;
  * Created by mike on 20.06.2016.
  */
 public interface BgSourceInterface {
+    boolean advancedFilteringSupported();
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/InsulinInterface.java b/app/src/main/java/info/nightscout/androidaps/interfaces/InsulinInterface.java
index 48efa587d8..0114b8a48d 100644
--- a/app/src/main/java/info/nightscout/androidaps/interfaces/InsulinInterface.java
+++ b/app/src/main/java/info/nightscout/androidaps/interfaces/InsulinInterface.java
@@ -10,16 +10,16 @@ import info.nightscout.androidaps.db.Treatment;
  */
 
 public interface InsulinInterface {
-    final int FASTACTINGINSULIN = 0;
-    final int FASTACTINGINSULINPROLONGED = 1;
-    final int OREF_RAPID_ACTING = 2;
-    final int OREF_ULTRA_RAPID_ACTING = 3;
-    final int OREF_FREE_PEAK = 4;
+    int FASTACTINGINSULIN = 0;
+    int FASTACTINGINSULINPROLONGED = 1;
+    int OREF_RAPID_ACTING = 2;
+    int OREF_ULTRA_RAPID_ACTING = 3;
+    int OREF_FREE_PEAK = 4;
 
 
     int getId();
     String getFriendlyName();
     String getComment();
     double getDia();
-    public Iob iobCalcForTreatment(Treatment treatment, long time, double dia);
+    Iob iobCalcForTreatment(Treatment treatment, long time, double dia);
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/PumpDescription.java b/app/src/main/java/info/nightscout/androidaps/interfaces/PumpDescription.java
index d37693d494..701b226031 100644
--- a/app/src/main/java/info/nightscout/androidaps/interfaces/PumpDescription.java
+++ b/app/src/main/java/info/nightscout/androidaps/interfaces/PumpDescription.java
@@ -35,4 +35,6 @@ public class PumpDescription {
     public double basalMinimumRate = 0.04d;
 
     public boolean isRefillingCapable = false;
+
+    public boolean storesCarbInfo = true;
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java b/app/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java
index 044b259ac9..134b419240 100644
--- a/app/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java
+++ b/app/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java
@@ -30,6 +30,7 @@ public interface TreatmentsInterface {
 
     List<Treatment> getTreatmentsFromHistory();
     List<Treatment> getTreatments5MinBackFromHistory(long time);
+    long getLastBolusTime();
 
     // real basals (not faked by extended bolus)
     boolean isInHistoryRealTempBasalInProgress();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Common/SubscriberFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Common/SubscriberFragment.java
index 74abc837fe..5ca9232646 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Common/SubscriberFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Common/SubscriberFragment.java
@@ -2,9 +2,12 @@ package info.nightscout.androidaps.plugins.Common;
 
 import android.support.v4.app.Fragment;
 
+import butterknife.Unbinder;
 import info.nightscout.androidaps.MainApp;
 
 abstract public class SubscriberFragment extends Fragment {
+    protected Unbinder unbinder;
+
     @Override
     public void onPause() {
         super.onPause();
@@ -18,5 +21,12 @@ abstract public class SubscriberFragment extends Fragment {
         updateGUI();
     }
 
+    @Override public void onDestroyView() {
+        super.onDestroyView();
+        if (unbinder != null)
+            unbinder.unbind();
+    }
+
+
     protected abstract void updateGUI();
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java
index 99ff546eac..1f0563bb0a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java
@@ -23,11 +23,14 @@ import info.nightscout.androidaps.data.MealData;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.ProfileIntervals;
 import info.nightscout.androidaps.data.PumpEnactResult;
+import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.ProfileSwitch;
+import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.db.TempTarget;
 import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.db.Treatment;
+import info.nightscout.androidaps.events.EventAppInitialized;
 import info.nightscout.androidaps.interfaces.APSInterface;
 import info.nightscout.androidaps.interfaces.BgSourceInterface;
 import info.nightscout.androidaps.interfaces.ConstraintsInterface;
@@ -144,6 +147,7 @@ public class ConfigBuilderPlugin implements PluginBase, ConstraintsInterface, Tr
     public void initialize() {
         pluginList = MainApp.getPluginsList();
         loadSettings();
+        MainApp.bus().post(new EventAppInitialized());
     }
 
     public void storeSettings() {
@@ -351,33 +355,19 @@ public class ConfigBuilderPlugin implements PluginBase, ConstraintsInterface, Tr
         return found;
     }
 
-    /*
-        * Ex Pump interface
-        *
-        * Config builder return itself as a pump and check constraints before it passes command to pump driver
-        */
-
-
     /**
      * expect absolute request and allow both absolute and percent response based on pump capabilities
-     *
-     * @param request
-     * @return
-     *      true if command is going to be executed
-     *      false if error
      */
-
-    public boolean applyAPSRequest(APSResult request, Callback callback) {
+    public void applyAPSRequest(APSResult request, Callback callback) {
         PumpInterface pump = getActivePump();
         request.rate = applyBasalConstraints(request.rate);
-        PumpEnactResult result;
 
         if (!pump.isInitialized()) {
             log.debug("applyAPSRequest: " + MainApp.sResources.getString(R.string.pumpNotInitialized));
             if (callback != null) {
                 callback.result(new PumpEnactResult().comment(MainApp.sResources.getString(R.string.pumpNotInitialized)).enacted(false).success(false)).run();
             }
-            return false;
+            return;
         }
 
         if (pump.isSuspended()) {
@@ -385,43 +375,56 @@ public class ConfigBuilderPlugin implements PluginBase, ConstraintsInterface, Tr
             if (callback != null) {
                 callback.result(new PumpEnactResult().comment(MainApp.sResources.getString(R.string.pumpsuspended)).enacted(false).success(false)).run();
             }
-            return false;
+            return;
         }
 
         if (Config.logCongigBuilderActions)
             log.debug("applyAPSRequest: " + request.toString());
-        if ((request.rate == 0 && request.duration == 0) || Math.abs(request.rate - pump.getBaseBasalRate()) < pump.getPumpDescription().basalStep) {
-            if (isTempBasalInProgress()) {
+
+        if (request.tempBasalReqested) {
+            if ((request.rate == 0 && request.duration == 0) || Math.abs(request.rate - pump.getBaseBasalRate()) < pump.getPumpDescription().basalStep) {
+                if (isTempBasalInProgress()) {
+                    if (Config.logCongigBuilderActions)
+                        log.debug("applyAPSRequest: cancelTempBasal()");
+                    getCommandQueue().cancelTempBasal(false, callback);
+                } else {
+                    if (Config.logCongigBuilderActions)
+                        log.debug("applyAPSRequest: Basal set correctly");
+                    if (callback != null) {
+                        callback.result(new PumpEnactResult().absolute(request.rate).duration(0).enacted(false).success(true).comment("Basal set correctly")).run();
+                    }
+                }
+            } else if (isTempBasalInProgress()
+                    && getTempBasalRemainingMinutesFromHistory() > 5
+                    && Math.abs(request.rate - getTempBasalAbsoluteRateHistory()) < pump.getPumpDescription().basalStep) {
                 if (Config.logCongigBuilderActions)
-                    log.debug("applyAPSRequest: cancelTempBasal()");
-                getCommandQueue().cancelTempBasal(false, callback);
-                return true;
+                    log.debug("applyAPSRequest: Temp basal set correctly");
+                if (callback != null) {
+                    callback.result(new PumpEnactResult().absolute(getTempBasalAbsoluteRateHistory()).duration(getTempBasalFromHistory(System.currentTimeMillis()).getPlannedRemainingMinutes()).enacted(false).success(true).comment("Temp basal set correctly")).run();
+                }
             } else {
                 if (Config.logCongigBuilderActions)
-                    log.debug("applyAPSRequest: Basal set correctly");
-                if (callback != null) {
-                    callback.result(new PumpEnactResult().absolute(request.rate).duration(0).enacted(false).success(true).comment("Basal set correctly")).run();
-                }
-                return false;
+                    log.debug("applyAPSRequest: setTempBasalAbsolute()");
+                getCommandQueue().tempBasalAbsolute(request.rate, request.duration, false, callback);
             }
-        } else if (isTempBasalInProgress()
-                && getTempBasalRemainingMinutesFromHistory() > 5
-                && Math.abs(request.rate - getTempBasalAbsoluteRateHistory()) < pump.getPumpDescription().basalStep) {
-            if (Config.logCongigBuilderActions)
-                log.debug("applyAPSRequest: Temp basal set correctly");
-            if (callback != null) {
-                callback.result(new PumpEnactResult().absolute(getTempBasalAbsoluteRateHistory()).duration(getTempBasalFromHistory(System.currentTimeMillis()).getPlannedRemainingMinutes()).enacted(false).success(true).comment("Temp basal set correctly")).run();
+        }
+
+        if (request.bolusRequested) {
+            long lastBolusTime = getLastBolusTime();
+            if (lastBolusTime != 0 && lastBolusTime + 3 * 60 * 1000 > System.currentTimeMillis()) {
+                log.debug("SMB requsted but still in 3 min interval");
+            } else {
+                DetailedBolusInfo detailedBolusInfo = new DetailedBolusInfo();
+                detailedBolusInfo.eventType = CareportalEvent.CORRECTIONBOLUS;
+                detailedBolusInfo.insulin = request.smb;
+                detailedBolusInfo.isSMB = true;
+                detailedBolusInfo.source = Source.USER;
+                detailedBolusInfo.deliverAt = request.deliverAt;
+                getCommandQueue().bolus(detailedBolusInfo, callback);
             }
-            return false;
-        } else {
-            if (Config.logCongigBuilderActions)
-                log.debug("applyAPSRequest: setTempBasalAbsolute()");
-            getCommandQueue().tempBasalAbsolute(request.rate, request.duration, false, callback);
-            return true;
         }
     }
 
-
     /**
      * Constraints interface
      **/
@@ -596,6 +599,11 @@ public class ConfigBuilderPlugin implements PluginBase, ConstraintsInterface, Tr
         return activeTreatments.getTreatments5MinBackFromHistory(time);
     }
 
+    @Override
+    public long getLastBolusTime() {
+        return activeTreatments.getLastBolusTime();
+    }
+
     @Override
     public boolean isInHistoryRealTempBasalInProgress() {
         return activeTreatments.isInHistoryRealTempBasalInProgress();
@@ -786,10 +794,10 @@ public class ConfigBuilderPlugin implements PluginBase, ConstraintsInterface, Tr
                         return profile;
                 }
             }
-            // Unable to determine profile, failover to default
-            if (activeProfile.getProfile() == null)
-                return null; //app not initialized
         }
+        // Unable to determine profile, failover to default
+        if (activeProfile.getProfile() == null)
+            return null; //app not initialized
         Profile defaultProfile = activeProfile.getProfile().getDefaultProfile();
         if (defaultProfile != null)
             return defaultProfile;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Food/FoodFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Food/FoodFragment.java
index 558cf0d02f..a5c00aab7f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Food/FoodFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Food/FoodFragment.java
@@ -61,7 +61,6 @@ public class FoodFragment extends SubscriberFragment {
                              Bundle savedInstanceState) {
         try {
             View view = inflater.inflate(R.layout.food_fragment, container, false);
-
             filter = (EditText) view.findViewById(R.id.food_filter);
             clearFilter = (ImageView) view.findViewById(R.id.food_clearfilter);
             category = new SpinnerHelper(view.findViewById(R.id.food_category));
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefBasePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefBasePlugin.java
index cbe5f2ff64..b91eefdc9c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefBasePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefBasePlugin.java
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.Insulin;
 
+import com.squareup.otto.Bus;
+
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Iob;
@@ -44,38 +46,53 @@ public abstract class InsulinOrefBasePlugin implements PluginBase, InsulinInterf
         return true;
     }
 
+    public Bus getBus() {
+        return MainApp.bus();
+    }
+
     @Override
     public double getDia() {
         double dia = getUserDefinedDia();
         if(dia >= MIN_DIA){
             return dia;
         } else {
-            if((System.currentTimeMillis() - lastWarned) > 60*1000) {
-                lastWarned = System.currentTimeMillis();
-                Notification notification = new Notification(Notification.SHORT_DIA, String.format(MainApp.sResources.getString(R.string.dia_too_short), dia, MIN_DIA), Notification.URGENT);
-                MainApp.bus().post(new EventNewNotification(notification));
-            }
+            sendShortDiaNotification(dia);
             return MIN_DIA;
         }
     }
 
+    void sendShortDiaNotification(double dia) {
+        if((System.currentTimeMillis() - lastWarned) > 60*1000) {
+            lastWarned = System.currentTimeMillis();
+            Notification notification = new Notification(Notification.SHORT_DIA, String.format(this.getNotificationPattern(), dia, MIN_DIA), Notification.URGENT);
+            this.getBus().post(new EventNewNotification(notification));
+        }
+    }
+
+    public String getNotificationPattern() {
+        return MainApp.sResources.getString(R.string.dia_too_short);
+    }
+
     public double getUserDefinedDia() {
         return MainApp.getConfigBuilder().getProfile() != null ? MainApp.getConfigBuilder().getProfile().getDia() : MIN_DIA;
     }
 
+    public Iob iobCalcForTreatment(Treatment treatment, long time) {
+        return this.iobCalcForTreatment(treatment, time, 0d);
+    }
+
     @Override
     public Iob iobCalcForTreatment(Treatment treatment, long time, double dia) {
         Iob result = new Iob();
 
         int peak = getPeak();
 
-
         if (treatment.insulin != 0d) {
 
             long bolusTime = treatment.date;
             double t = (time - bolusTime) / 1000d / 60d;
 
-            double td = getDia()*60; //getDIA() always > 5
+            double td = getDia()*60; //getDIA() always >= MIN_DIA
             double tp = peak;
 
             // force the IOB to 0 if over DIA hours have passed
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/AutosensData.java b/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/AutosensData.java
index e6d58178f5..dddea570be 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/AutosensData.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/AutosensData.java
@@ -57,11 +57,15 @@ public class AutosensData {
     public double cob = 0;
     public double bgi = 0d;
     public double delta = 0d;
+    public double avgDelta = 0d;
+    public double avgDeviation = 0d;
 
     public double autosensRatio = 1d;
+    public double slopeFromMaxDeviation = 0;
+    public double slopeFromMinDeviation = 999;
 
     public String log(long time) {
-        return "AutosensData: " + new Date(time).toLocaleString() + " " + pastSensitivity + " Delta=" + delta + " Bgi=" + bgi + " Deviation=" + deviation + " Absorbed=" + absorbed + " CarbsFromBolus=" + carbsFromBolus + " COB=" + cob + " autosensRatio=" + autosensRatio;
+        return "AutosensData: " + new Date(time).toLocaleString() + " " + pastSensitivity + " Delta=" + delta + " avgDelta=" + avgDelta + " Bgi=" + bgi + " Deviation=" + deviation + " avgDeviation=" + avgDeviation + " Absorbed=" + absorbed + " CarbsFromBolus=" + carbsFromBolus + " COB=" + cob + " autosensRatio=" + autosensRatio + " slopeFromMaxDeviation=" + slopeFromMaxDeviation + " slopeFromMinDeviation =" + slopeFromMinDeviation ;
     }
 
     public int minOld() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/IobCobCalculatorPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/IobCobCalculatorPlugin.java
index fbbbe43ccc..c891f60d49 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/IobCobCalculatorPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/IobCobCalculatorPlugin.java
@@ -1,8 +1,6 @@
 package info.nightscout.androidaps.plugins.IobCobCalculator;
 
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.Process;
+import android.os.SystemClock;
 import android.support.annotation.Nullable;
 import android.support.v4.util.LongSparseArray;
 
@@ -24,15 +22,17 @@ import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.db.TemporaryBasal;
-import info.nightscout.androidaps.db.Treatment;
+import info.nightscout.androidaps.events.Event;
+import info.nightscout.androidaps.events.EventAppInitialized;
 import info.nightscout.androidaps.events.EventConfigBuilderChange;
 import info.nightscout.androidaps.events.EventNewBG;
 import info.nightscout.androidaps.events.EventNewBasalProfile;
 import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.IobCobCalculator.events.EventAutosensCalculationFinished;
 import info.nightscout.androidaps.plugins.IobCobCalculator.events.EventNewHistoryData;
+import info.nightscout.androidaps.plugins.OpenAPSSMB.OpenAPSSMBPlugin;
+import info.nightscout.utils.DateUtil;
 
 /**
  * Created by mike on 24.04.2017.
@@ -50,10 +50,10 @@ public class IobCobCalculatorPlugin implements PluginBase {
 
     private static double dia = Constants.defaultDIA;
 
-    private static Handler sHandler = null;
-    private static HandlerThread sHandlerThread = null;
+    static final Object dataLock = new Object();
 
-    private static final Object dataLock = new Object();
+    boolean stopCalculationTrigger = false;
+    IobCobThread thread = null;
 
     private static IobCobCalculatorPlugin plugin = null;
 
@@ -131,14 +131,8 @@ public class IobCobCalculatorPlugin implements PluginBase {
         return -1;
     }
 
-    IobCobCalculatorPlugin() {
+    private IobCobCalculatorPlugin() {
         MainApp.bus().register(this);
-        if (sHandlerThread == null) {
-            sHandlerThread = new HandlerThread(IobCobCalculatorPlugin.class.getSimpleName(), Process.THREAD_PRIORITY_LOWEST);
-            sHandlerThread.start();
-            sHandler = new Handler(sHandlerThread.getLooper());
-        }
-        onNewBg(new EventNewBG());
     }
 
     @Nullable
@@ -175,14 +169,9 @@ public class IobCobCalculatorPlugin implements PluginBase {
         return rouded;
     }
 
-    private void loadBgData() {
-        //log.debug("Locking loadBgData");
-        synchronized (dataLock) {
-            onNewProfile(null);
-            bgReadings = MainApp.getDbHelper().getBgreadingsDataFromTime((long) (System.currentTimeMillis() - 60 * 60 * 1000L * (24 + dia)), false);
-            log.debug("BG data loaded. Size: " + bgReadings.size());
-        }
-        //log.debug("Releasing loadBgData");
+    void loadBgData() {
+        bgReadings = MainApp.getDbHelper().getBgreadingsDataFromTime((long) (System.currentTimeMillis() - 60 * 60 * 1000L * (24 + dia)), false);
+        log.debug("BG data loaded. Size: " + bgReadings.size());
     }
 
     private boolean isAbout5minData() {
@@ -209,7 +198,7 @@ public class IobCobCalculatorPlugin implements PluginBase {
         }
     }
 
-    private void createBucketedData() {
+    void createBucketedData() {
         if (isAbout5minData())
             createBucketedData5min();
         else
@@ -241,223 +230,97 @@ public class IobCobCalculatorPlugin implements PluginBase {
     }
 
     private void createBucketedDataRecalculated() {
-        synchronized (dataLock) {
-            if (bgReadings == null || bgReadings.size() < 3) {
-                bucketed_data = null;
-                return;
+        if (bgReadings == null || bgReadings.size() < 3) {
+            bucketed_data = null;
+            return;
+        }
+
+        bucketed_data = new ArrayList<>();
+        long currentTime = bgReadings.get(0).date + 5 * 60 * 1000 - bgReadings.get(0).date % (5 * 60 * 1000) - 5 * 60 * 1000L;
+        //log.debug("First reading: " + new Date(currentTime).toLocaleString());
+
+        while (true) {
+            // test if current value is older than current time
+            BgReading newer = findNewer(currentTime);
+            BgReading older = findOlder(currentTime);
+            if (newer == null || older == null)
+                break;
+
+            double bgDelta = newer.value - older.value;
+            long timeDiffToNew = newer.date - currentTime;
+
+            double currentBg = newer.value - (double) timeDiffToNew / (newer.date - older.date) * bgDelta;
+            BgReading newBgreading = new BgReading();
+            newBgreading.date = currentTime;
+            newBgreading.value = Math.round(currentBg);
+            bucketed_data.add(newBgreading);
+            //log.debug("BG: " + newBgreading.value + " (" + new Date(newBgreading.date).toLocaleString() + ") Prev: " + older.value + " (" + new Date(older.date).toLocaleString() + ") Newer: " + newer.value + " (" + new Date(newer.date).toLocaleString() + ")");
+            currentTime -= 5 * 60 * 1000L;
+
+        }
+    }
+
+
+    private void createBucketedData5min() {
+        if (bgReadings == null || bgReadings.size() < 3) {
+            bucketed_data = null;
+            return;
+        }
+
+        bucketed_data = new ArrayList<>();
+        bucketed_data.add(bgReadings.get(0));
+        int j = 0;
+        for (int i = 1; i < bgReadings.size(); ++i) {
+            long bgTime = bgReadings.get(i).date;
+            long lastbgTime = bgReadings.get(i - 1).date;
+            //log.error("Processing " + i + ": " + new Date(bgTime).toString() + " " + bgReadings.get(i).value + "   Previous: " + new Date(lastbgTime).toString() + " " + bgReadings.get(i - 1).value);
+            if (bgReadings.get(i).value < 39 || bgReadings.get(i - 1).value < 39) {
+                continue;
             }
 
-            bucketed_data = new ArrayList<>();
-            long currentTime = bgReadings.get(0).date + 5 * 60 * 1000 - bgReadings.get(0).date % (5 * 60 * 1000) - 5 * 60 * 1000L;
-            //log.debug("First reading: " + new Date(currentTime).toLocaleString());
+            long elapsed_minutes = (bgTime - lastbgTime) / (60 * 1000);
+            if (Math.abs(elapsed_minutes) > 8) {
+                // interpolate missing data points
+                double lastbg = bgReadings.get(i - 1).value;
+                elapsed_minutes = Math.abs(elapsed_minutes);
+                //console.error(elapsed_minutes);
+                long nextbgTime;
+                while (elapsed_minutes > 5) {
+                    nextbgTime = lastbgTime - 5 * 60 * 1000;
+                    j++;
+                    BgReading newBgreading = new BgReading();
+                    newBgreading.date = nextbgTime;
+                    double gapDelta = bgReadings.get(i).value - lastbg;
+                    //console.error(gapDelta, lastbg, elapsed_minutes);
+                    double nextbg = lastbg + (5d / elapsed_minutes * gapDelta);
+                    newBgreading.value = Math.round(nextbg);
+                    //console.error("Interpolated", bucketed_data[j]);
+                    bucketed_data.add(newBgreading);
+                    //log.error("******************************************************************************************************* Adding:" + new Date(newBgreading.date).toString() + " " + newBgreading.value);
 
-            while (true) {
-                // test if current value is older than current time
-                BgReading newer = findNewer(currentTime);
-                BgReading older = findOlder(currentTime);
-                if (newer == null || older == null)
-                    break;
-
-                double bgDelta = newer.value - older.value;
-                long timeDiffToNew = newer.date - currentTime;
-
-                double currentBg = newer.value - (double) timeDiffToNew / (newer.date - older.date) * bgDelta;
+                    elapsed_minutes = elapsed_minutes - 5;
+                    lastbg = nextbg;
+                    lastbgTime = nextbgTime;
+                }
+                j++;
                 BgReading newBgreading = new BgReading();
-                newBgreading.date = currentTime;
-                newBgreading.value = Math.round(currentBg);
+                newBgreading.value = bgReadings.get(i).value;
+                newBgreading.date = bgTime;
                 bucketed_data.add(newBgreading);
-                //log.debug("BG: " + newBgreading.value + " (" + new Date(newBgreading.date).toLocaleString() + ") Prev: " + older.value + " (" + new Date(older.date).toLocaleString() + ") Newer: " + newer.value + " (" + new Date(newer.date).toLocaleString() + ")");
-                currentTime -= 5 * 60 * 1000L;
-
+                //log.error("******************************************************************************************************* Copying:" + new Date(newBgreading.date).toString() + " " + newBgreading.value);
+            } else if (Math.abs(elapsed_minutes) > 2) {
+                j++;
+                BgReading newBgreading = new BgReading();
+                newBgreading.value = bgReadings.get(i).value;
+                newBgreading.date = bgTime;
+                bucketed_data.add(newBgreading);
+                //log.error("******************************************************************************************************* Copying:" + new Date(newBgreading.date).toString() + " " + newBgreading.value);
+            } else {
+                bucketed_data.get(j).value = (bucketed_data.get(j).value + bgReadings.get(i).value) / 2;
+                //log.error("***** Average");
             }
         }
-    }
-
-
-    public void createBucketedData5min() {
-        //log.debug("Locking createBucketedData");
-        synchronized (dataLock) {
-            if (bgReadings == null || bgReadings.size() < 3) {
-                bucketed_data = null;
-                return;
-            }
-
-            bucketed_data = new ArrayList<>();
-            bucketed_data.add(bgReadings.get(0));
-            int j = 0;
-            for (int i = 1; i < bgReadings.size(); ++i) {
-                long bgTime = bgReadings.get(i).date;
-                long lastbgTime = bgReadings.get(i - 1).date;
-                //log.error("Processing " + i + ": " + new Date(bgTime).toString() + " " + bgReadings.get(i).value + "   Previous: " + new Date(lastbgTime).toString() + " " + bgReadings.get(i - 1).value);
-                if (bgReadings.get(i).value < 39 || bgReadings.get(i - 1).value < 39) {
-                    continue;
-                }
-
-                long elapsed_minutes = (bgTime - lastbgTime) / (60 * 1000);
-                if (Math.abs(elapsed_minutes) > 8) {
-                    // interpolate missing data points
-                    double lastbg = bgReadings.get(i - 1).value;
-                    elapsed_minutes = Math.abs(elapsed_minutes);
-                    //console.error(elapsed_minutes);
-                    long nextbgTime;
-                    while (elapsed_minutes > 5) {
-                        nextbgTime = lastbgTime - 5 * 60 * 1000;
-                        j++;
-                        BgReading newBgreading = new BgReading();
-                        newBgreading.date = nextbgTime;
-                        double gapDelta = bgReadings.get(i).value - lastbg;
-                        //console.error(gapDelta, lastbg, elapsed_minutes);
-                        double nextbg = lastbg + (5d / elapsed_minutes * gapDelta);
-                        newBgreading.value = Math.round(nextbg);
-                        //console.error("Interpolated", bucketed_data[j]);
-                        bucketed_data.add(newBgreading);
-                        //log.error("******************************************************************************************************* Adding:" + new Date(newBgreading.date).toString() + " " + newBgreading.value);
-
-                        elapsed_minutes = elapsed_minutes - 5;
-                        lastbg = nextbg;
-                        lastbgTime = nextbgTime;
-                    }
-                    j++;
-                    BgReading newBgreading = new BgReading();
-                    newBgreading.value = bgReadings.get(i).value;
-                    newBgreading.date = bgTime;
-                    bucketed_data.add(newBgreading);
-                    //log.error("******************************************************************************************************* Copying:" + new Date(newBgreading.date).toString() + " " + newBgreading.value);
-                } else if (Math.abs(elapsed_minutes) > 2) {
-                    j++;
-                    BgReading newBgreading = new BgReading();
-                    newBgreading.value = bgReadings.get(i).value;
-                    newBgreading.date = bgTime;
-                    bucketed_data.add(newBgreading);
-                    //log.error("******************************************************************************************************* Copying:" + new Date(newBgreading.date).toString() + " " + newBgreading.value);
-                } else {
-                    bucketed_data.get(j).value = (bucketed_data.get(j).value + bgReadings.get(i).value) / 2;
-                    //log.error("***** Average");
-                }
-            }
-            log.debug("Bucketed data created. Size: " + bucketed_data.size());
-        }
-        //log.debug("Releasing createBucketedData");
-    }
-
-    private void calculateSensitivityData() {
-        if (MainApp.getConfigBuilder() == null)
-            return; // app still initializing
-        if (MainApp.getConfigBuilder().getProfile() == null)
-            return; // app still initializing
-        //log.debug("Locking calculateSensitivityData");
-        long oldestTimeWithData = oldestDataAvailable();
-
-        synchronized (dataLock) {
-
-            if (bucketed_data == null || bucketed_data.size() < 3) {
-                log.debug("calculateSensitivityData: No bucketed data available");
-                return;
-            }
-
-            long prevDataTime = roundUpTime(bucketed_data.get(bucketed_data.size() - 3).date);
-            log.debug("Prev data time: " + new Date(prevDataTime).toLocaleString());
-            AutosensData previous = autosensDataTable.get(prevDataTime);
-            // start from oldest to be able sub cob
-            for (int i = bucketed_data.size() - 4; i >= 0; i--) {
-                // check if data already exists
-                long bgTime = bucketed_data.get(i).date;
-                bgTime = roundUpTime(bgTime);
-                if (bgTime > System.currentTimeMillis())
-                    continue;
-                Profile profile = MainApp.getConfigBuilder().getProfile(bgTime);
-
-                AutosensData existing;
-                if ((existing = autosensDataTable.get(bgTime)) != null) {
-                    previous = existing;
-                    continue;
-                }
-
-                if (profile.getIsf(bgTime) == null)
-                    return; // profile not set yet
-
-                double sens = Profile.toMgdl(profile.getIsf(bgTime), profile.getUnits());
-
-                AutosensData autosensData = new AutosensData();
-                autosensData.time = bgTime;
-                if (previous != null)
-                    autosensData.activeCarbsList = new ArrayList<>(previous.activeCarbsList);
-                else
-                    autosensData.activeCarbsList = new ArrayList<>();
-
-                //console.error(bgTime , bucketed_data[i].glucose);
-                double bg;
-                double avgDelta;
-                double delta;
-                bg = bucketed_data.get(i).value;
-                if (bg < 39 || bucketed_data.get(i + 3).value < 39) {
-                    log.error("! value < 39");
-                    continue;
-                }
-                delta = (bg - bucketed_data.get(i + 1).value);
-
-                IobTotal iob = calculateFromTreatmentsAndTemps(bgTime);
-
-                double bgi = -iob.activity * sens * 5;
-                double deviation = delta - bgi;
-
-                List<Treatment> recentTreatments = MainApp.getConfigBuilder().getTreatments5MinBackFromHistory(bgTime);
-                for (int ir = 0; ir < recentTreatments.size(); ir++) {
-                    autosensData.carbsFromBolus += recentTreatments.get(ir).carbs;
-                    autosensData.activeCarbsList.add(new AutosensData.CarbsInPast(recentTreatments.get(ir)));
-                }
-
-
-                // if we are absorbing carbs
-                if (previous != null && previous.cob > 0) {
-                    // calculate sum of min carb impact from all active treatments
-                    double totalMinCarbsImpact = 0d;
-                    for (int ii = 0; ii < autosensData.activeCarbsList.size(); ++ii) {
-                        AutosensData.CarbsInPast c = autosensData.activeCarbsList.get(ii);
-                        totalMinCarbsImpact += c.min5minCarbImpact;
-                    }
-
-                    // figure out how many carbs that represents
-                    // but always assume at least 3mg/dL/5m (default) absorption per active treatment
-                    double ci = Math.max(deviation, totalMinCarbsImpact);
-                    autosensData.absorbed = ci * profile.getIc(bgTime) / sens;
-                    // and add that to the running total carbsAbsorbed
-                    autosensData.cob = Math.max(previous.cob - autosensData.absorbed, 0d);
-                    autosensData.substractAbosorbedCarbs();
-                }
-                autosensData.removeOldCarbs(bgTime);
-                autosensData.cob += autosensData.carbsFromBolus;
-                autosensData.deviation = deviation;
-                autosensData.bgi = bgi;
-                autosensData.delta = delta;
-
-                // calculate autosens only without COB
-                if (autosensData.cob <= 0) {
-                    if (Math.abs(deviation) < Constants.DEVIATION_TO_BE_EQUAL) {
-                        autosensData.pastSensitivity += "=";
-                        autosensData.nonEqualDeviation = true;
-                    } else if (deviation > 0) {
-                        autosensData.pastSensitivity += "+";
-                        autosensData.nonEqualDeviation = true;
-                    } else {
-                        autosensData.pastSensitivity += "-";
-                        autosensData.nonEqualDeviation = true;
-                    }
-                    autosensData.nonCarbsDeviation = true;
-                } else {
-                    autosensData.pastSensitivity += "C";
-                }
-                //log.debug("TIME: " + new Date(bgTime).toString() + " BG: " + bg + " SENS: " + sens + " DELTA: " + delta + " AVGDELTA: " + avgDelta + " IOB: " + iob.iob + " ACTIVITY: " + iob.activity + " BGI: " + bgi + " DEVIATION: " + deviation);
-
-                previous = autosensData;
-                autosensDataTable.put(bgTime, autosensData);
-                autosensData.autosensRatio = detectSensitivity(oldestTimeWithData, bgTime).ratio;
-                if (Config.logAutosensData)
-                    log.debug(autosensData.log(bgTime));
-            }
-        }
-        MainApp.bus().post(new EventAutosensCalculationFinished());
-        //log.debug("Releasing calculateSensitivityData");
+        log.debug("Bucketed data created. Size: " + bucketed_data.size());
     }
 
     public static long oldestDataAvailable() {
@@ -486,6 +349,21 @@ public class IobCobCalculatorPlugin implements PluginBase {
         }
         IobTotal bolusIob = MainApp.getConfigBuilder().getCalculationToTimeTreatments(time).round();
         IobTotal basalIob = MainApp.getConfigBuilder().getCalculationToTimeTempBasals(time).round();
+        if (OpenAPSSMBPlugin.getPlugin().isEnabled(PluginBase.APS)) {
+            // Add expected zere temp basal for next 240 mins
+            IobTotal basalIobWithZeroTemp = basalIob.clone();
+            TemporaryBasal t = new TemporaryBasal();
+            t.date = now + 60 * 1000L;
+            t.durationInMinutes = 240;
+            t.isAbsolute = true;
+            t.absoluteRate = 0;
+            if (t.date < time) {
+                IobTotal calc = t.iobCalc(time);
+                basalIobWithZeroTemp.plus(calc);
+            }
+
+            basalIob.iobWithZeroTemp = basalIobWithZeroTemp;
+        }
 
         IobTotal iobTotal = IobTotal.combine(bolusIob, basalIob).round();
         if (time < System.currentTimeMillis()) {
@@ -580,11 +458,11 @@ public class IobCobCalculatorPlugin implements PluginBase {
             return null;
         }
         if (data.time < System.currentTimeMillis() - 11 * 60 * 1000) {
-            log.debug("AUTOSENSDATA null: data is old (" + reason + ")");
+            log.debug("AUTOSENSDATA null: data is old (" + reason + ") size()=" + autosensDataTable.size() + " lastdata=" + DateUtil.dateAndTimeString(data.time));
             return null;
         } else {
             if (data == null)
-                log.debug("AUTOSENSDATA null: data == null (" + " " + reason + ")");
+                log.debug("AUTOSENSDATA null: data == null (" + " " + reason + ") size()=" + autosensDataTable.size() + " lastdata=" + DateUtil.dateAndTimeString(data.time));
             return data;
         }
     }
@@ -606,13 +484,30 @@ public class IobCobCalculatorPlugin implements PluginBase {
         return array;
     }
 
+   public static IobTotal[] calculateIobArrayForSMB() {
+        Profile profile = MainApp.getConfigBuilder().getProfile();
+        // predict IOB out to DIA plus 30m
+        long time = System.currentTimeMillis();
+        time = roundUpTime(time);
+        int len = (4 * 60) / 5;
+        IobTotal[] array = new IobTotal[len];
+        int pos = 0;
+        for (int i = 0; i < len; i++) {
+            long t = time + i * 5 * 60000;
+            IobTotal iob = calculateFromTreatmentsAndTempsSynchronized(t);
+            array[pos] = iob;
+            pos++;
+        }
+        return array;
+    }
+
     public static AutosensResult detectSensitivityWithLock(long fromTime, long toTime) {
         synchronized (dataLock) {
             return detectSensitivity(fromTime, toTime);
         }
     }
 
-    private static AutosensResult detectSensitivity(long fromTime, long toTime) {
+    static AutosensResult detectSensitivity(long fromTime, long toTime) {
         return ConfigBuilderPlugin.getActiveSensitivity().detectSensitivity(fromTime, toTime);
     }
 
@@ -625,15 +520,33 @@ public class IobCobCalculatorPlugin implements PluginBase {
     }
 
     @Subscribe
-    public void onNewBg(EventNewBG ev) {
-        sHandler.post(new Runnable() {
-            @Override
-            public void run() {
-                loadBgData();
-                createBucketedData();
-                calculateSensitivityData();
+    public void onEventAppInitialized(EventAppInitialized ev) {
+        runCalculation("onEventAppInitialized", true, ev);
+    }
+
+    @Subscribe
+    public void onEventNewBG(EventNewBG ev) {
+        stopCalculation("onEventNewBG");
+        runCalculation("onEventNewBG", true, ev);
+    }
+
+    private void stopCalculation(String from) {
+        if (thread != null && thread.getState() != Thread.State.TERMINATED) {
+            stopCalculationTrigger = true;
+            log.debug("Stopping calculation thread: " + from);
+            while (thread.getState() != Thread.State.TERMINATED) {
+                SystemClock.sleep(100);
             }
-        });
+            log.debug("Calculation thread stopped: " + from);
+        }
+    }
+
+    private void runCalculation(String from, boolean bgDataReload, Event cause) {
+        log.debug("Starting calculation thread: " + from);
+        if (thread == null || thread.getState() == Thread.State.TERMINATED) {
+            thread = new IobCobThread(this, from, bgDataReload, cause);
+            thread.start();
+        }
     }
 
     @Subscribe
@@ -647,66 +560,55 @@ public class IobCobCalculatorPlugin implements PluginBase {
         if (ev == null) { // on init no need of reset
             return;
         }
+        stopCalculation("onNewProfile");
         synchronized (dataLock) {
             log.debug("Invalidating cached data because of new profile. IOB: " + iobTable.size() + " Autosens: " + autosensDataTable.size() + " records");
             iobTable = new LongSparseArray<>();
             autosensDataTable = new LongSparseArray<>();
         }
-        sHandler.post(new Runnable() {
-            @Override
-            public void run() {
-                calculateSensitivityData();
-            }
-        });
+        runCalculation("onNewProfile", false, ev);
     }
 
     @Subscribe
-    public void onStatusEvent(EventPreferenceChange ev) {
+    public void onEventPreferenceChange(EventPreferenceChange ev) {
         if (ev.isChanged(R.string.key_openapsama_autosens_period) ||
                 ev.isChanged(R.string.key_age) ||
                 ev.isChanged(R.string.key_absorption_maxtime)
                 ) {
+            stopCalculation("onEventPreferenceChange");
             synchronized (dataLock) {
                 log.debug("Invalidating cached data because of preference change. IOB: " + iobTable.size() + " Autosens: " + autosensDataTable.size() + " records");
                 iobTable = new LongSparseArray<>();
                 autosensDataTable = new LongSparseArray<>();
             }
-            sHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    calculateSensitivityData();
-                }
-            });
+            runCalculation("onEventPreferenceChange", false, ev);
         }
     }
 
     @Subscribe
-    public void onStatusEvent(EventConfigBuilderChange ev) {
+    public void onEventConfigBuilderChange(EventConfigBuilderChange ev) {
+        stopCalculation("onEventConfigBuilderChange");
         synchronized (dataLock) {
             log.debug("Invalidating cached data because of configuration change. IOB: " + iobTable.size() + " Autosens: " + autosensDataTable.size() + " records");
             iobTable = new LongSparseArray<>();
             autosensDataTable = new LongSparseArray<>();
         }
-        sHandler.post(new Runnable() {
-            @Override
-            public void run() {
-                calculateSensitivityData();
-            }
-        });
+        runCalculation("onEventConfigBuilderChange", false, ev);
     }
 
     // When historical data is changed (comming from NS etc) finished calculations after this date must be invalidated
     @Subscribe
-    public void onNewHistoryData(EventNewHistoryData ev) {
+    public void onEventNewHistoryData(EventNewHistoryData ev) {
         //log.debug("Locking onNewHistoryData");
+        stopCalculation("onEventNewHistoryData");
         synchronized (dataLock) {
-            long time = ev.time;
+            // clear up 5 min back for proper COB calculation
+            long time = ev.time - 5 * 60 * 1000L;
             log.debug("Invalidating cached data to: " + new Date(time).toLocaleString());
             for (int index = iobTable.size() - 1; index >= 0; index--) {
                 if (iobTable.keyAt(index) > time) {
                     if (Config.logAutosensData)
-                        if (Config.logAutosensData)
-                            log.debug("Removing from iobTable: " + new Date(iobTable.keyAt(index)).toLocaleString());
+                        log.debug("Removing from iobTable: " + new Date(iobTable.keyAt(index)).toLocaleString());
                     iobTable.removeAt(index);
                 } else {
                     break;
@@ -731,12 +633,7 @@ public class IobCobCalculatorPlugin implements PluginBase {
                 }
             }
         }
-        sHandler.post(new Runnable() {
-            @Override
-            public void run() {
-                calculateSensitivityData();
-            }
-        });
+        runCalculation("onEventNewHistoryData", false, ev);
         //log.debug("Releasing onNewHistoryData");
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/IobCobThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/IobCobThread.java
new file mode 100644
index 0000000000..4f63cacf62
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/IobCobThread.java
@@ -0,0 +1,248 @@
+package info.nightscout.androidaps.plugins.IobCobCalculator;
+
+import android.content.Context;
+import android.os.PowerManager;
+import android.support.v4.util.LongSparseArray;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import info.nightscout.androidaps.Config;
+import info.nightscout.androidaps.Constants;
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.data.IobTotal;
+import info.nightscout.androidaps.data.Profile;
+import info.nightscout.androidaps.db.BgReading;
+import info.nightscout.androidaps.db.Treatment;
+import info.nightscout.androidaps.events.Event;
+import info.nightscout.androidaps.plugins.IobCobCalculator.events.EventAutosensCalculationFinished;
+import info.nightscout.androidaps.queue.QueueThread;
+
+import static info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin.getBucketedData;
+import static info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin.oldestDataAvailable;
+import static info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin.roundUpTime;
+
+/**
+ * Created by mike on 23.01.2018.
+ */
+
+public class IobCobThread extends Thread {
+    private static Logger log = LoggerFactory.getLogger(QueueThread.class);
+    private final Event cause;
+
+    private IobCobCalculatorPlugin iobCobCalculatorPlugin;
+    private boolean bgDataReload;
+    private String from;
+
+    private PowerManager.WakeLock mWakeLock;
+
+    public IobCobThread(IobCobCalculatorPlugin plugin, String from, boolean bgDataReload, Event cause) {
+        super();
+
+        this.iobCobCalculatorPlugin = plugin;
+        this.bgDataReload = bgDataReload;
+        this.from = from;
+        this.cause = cause;
+
+        PowerManager powerManager = (PowerManager) MainApp.instance().getApplicationContext().getSystemService(Context.POWER_SERVICE);
+        mWakeLock = powerManager.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK, "iobCobThread");
+    }
+
+    @Override
+    public final void run() {
+        mWakeLock.acquire();
+        try {
+            if (MainApp.getConfigBuilder() == null) {
+                log.debug("Aborting calculation thread (ConfigBuilder not ready): " + from);
+                return; // app still initializing
+            }
+            if (MainApp.getConfigBuilder().getProfile() == null) {
+                log.debug("Aborting calculation thread (No profile): " + from);
+                return; // app still initializing
+            }
+            //log.debug("Locking calculateSensitivityData");
+
+            Object dataLock = iobCobCalculatorPlugin.dataLock;
+
+            long oldestTimeWithData = oldestDataAvailable();
+
+            synchronized (dataLock) {
+                if (bgDataReload) {
+                    iobCobCalculatorPlugin.loadBgData();
+                    iobCobCalculatorPlugin.createBucketedData();
+                }
+                List<BgReading> bucketed_data = getBucketedData();
+                LongSparseArray<AutosensData> autosensDataTable = iobCobCalculatorPlugin.getAutosensDataTable();
+
+                if (bucketed_data == null || bucketed_data.size() < 3) {
+                    log.debug("Aborting calculation thread (No bucketed data available): " + from);
+                    return;
+                }
+
+                long prevDataTime = roundUpTime(bucketed_data.get(bucketed_data.size() - 3).date);
+                log.debug("Prev data time: " + new Date(prevDataTime).toLocaleString());
+                AutosensData previous = autosensDataTable.get(prevDataTime);
+                // start from oldest to be able sub cob
+                for (int i = bucketed_data.size() - 4; i >= 0; i--) {
+                    if (iobCobCalculatorPlugin.stopCalculationTrigger) {
+                        iobCobCalculatorPlugin.stopCalculationTrigger = false;
+                        log.debug("Aborting calculation thread (trigger): " + from);
+                        return;
+                    }
+                    // check if data already exists
+                    long bgTime = bucketed_data.get(i).date;
+                    bgTime = roundUpTime(bgTime);
+                    if (bgTime > System.currentTimeMillis())
+                        continue;
+                    Profile profile = MainApp.getConfigBuilder().getProfile(bgTime);
+
+                    AutosensData existing;
+                    if ((existing = autosensDataTable.get(bgTime)) != null) {
+                        previous = existing;
+                        continue;
+                    }
+
+                    if (profile == null) {
+                        log.debug("Aborting calculation thread (no profile): " + from);
+                        return; // profile not set yet
+                    }
+
+                    if (profile.getIsf(bgTime) == null) {
+                        log.debug("Aborting calculation thread (no ISF): " + from);
+                        return; // profile not set yet
+                    }
+
+                    if (Config.logAutosensData)
+                        log.debug("Processing calculation thread: " + from + " (" + i + "/" + bucketed_data.size() + ")");
+
+                    double sens = Profile.toMgdl(profile.getIsf(bgTime), profile.getUnits());
+
+                    AutosensData autosensData = new AutosensData();
+                    autosensData.time = bgTime;
+                    if (previous != null)
+                        autosensData.activeCarbsList = new ArrayList<>(previous.activeCarbsList);
+                    else
+                        autosensData.activeCarbsList = new ArrayList<>();
+
+                    //console.error(bgTime , bucketed_data[i].glucose);
+                    double bg;
+                    double avgDelta;
+                    double delta;
+                    bg = bucketed_data.get(i).value;
+                    if (bg < 39 || bucketed_data.get(i + 3).value < 39) {
+                        log.error("! value < 39");
+                        continue;
+                    }
+                    delta = (bg - bucketed_data.get(i + 1).value);
+                    avgDelta = (bg - bucketed_data.get(i + 3).value) / 3;
+
+                    IobTotal iob = iobCobCalculatorPlugin.calculateFromTreatmentsAndTemps(bgTime);
+
+                    double bgi = -iob.activity * sens * 5;
+                    double deviation = delta - bgi;
+                    double avgDeviation = Math.round((avgDelta - bgi) * 1000) / 1000;
+
+                    double currentDeviation;
+                    double slopeFromMaxDeviation  = 0;
+                    double slopeFromMinDeviation  = 999;
+                    double maxDeviation = 0;
+                    double minDeviation = 999;
+
+                    // https://github.com/openaps/oref0/blob/master/lib/determine-basal/cob-autosens.js#L169
+                    if (i < bucketed_data.size() - 16) { // we need 1h of data to calculate minDeviationSlope
+                        long hourago = bgTime + 10 * 1000 - 60 * 60 * 1000L;
+                        AutosensData hourAgoData = iobCobCalculatorPlugin.getAutosensData(hourago);
+                        if (hourAgoData != null) {
+                            currentDeviation = hourAgoData.avgDeviation;
+                            int initialIndex = autosensDataTable.indexOfKey(hourAgoData.time);
+
+                            for (int past = 1; past < 12; past++) {
+                                AutosensData ad = autosensDataTable.valueAt(initialIndex + past);
+                                double deviationSlope = (ad.avgDeviation - currentDeviation) / (ad.time - bgTime) * 1000 * 60 * 5;
+                                if (ad.avgDeviation > maxDeviation) {
+                                    slopeFromMaxDeviation = Math.min(0, deviationSlope);
+                                    maxDeviation = ad.avgDeviation;
+                                }
+                                if (avgDeviation < minDeviation) {
+                                    slopeFromMinDeviation = Math.max(0, deviationSlope);
+                                    minDeviation = avgDeviation;
+                                }
+
+                                //if (Config.logAutosensData)
+                                //    log.debug("Deviations: " + new Date(bgTime) + new Date(ad.time) + " avgDeviation=" + avgDeviation + " deviationSlope=" + deviationSlope + " slopeFromMaxDeviation=" + slopeFromMaxDeviation + " slopeFromMinDeviation=" + slopeFromMinDeviation);
+                            }
+                        }
+                    }
+
+                    List<Treatment> recentTreatments = MainApp.getConfigBuilder().getTreatments5MinBackFromHistory(bgTime);
+                    for (int ir = 0; ir < recentTreatments.size(); ir++) {
+                        autosensData.carbsFromBolus += recentTreatments.get(ir).carbs;
+                        autosensData.activeCarbsList.add(new AutosensData.CarbsInPast(recentTreatments.get(ir)));
+                    }
+
+
+                    // if we are absorbing carbs
+                    if (previous != null && previous.cob > 0) {
+                        // calculate sum of min carb impact from all active treatments
+                        double totalMinCarbsImpact = 0d;
+                        for (int ii = 0; ii < autosensData.activeCarbsList.size(); ++ii) {
+                            AutosensData.CarbsInPast c = autosensData.activeCarbsList.get(ii);
+                            totalMinCarbsImpact += c.min5minCarbImpact;
+                        }
+
+                        // figure out how many carbs that represents
+                        // but always assume at least 3mg/dL/5m (default) absorption per active treatment
+                        double ci = Math.max(deviation, totalMinCarbsImpact);
+                        autosensData.absorbed = ci * profile.getIc(bgTime) / sens;
+                        // and add that to the running total carbsAbsorbed
+                        autosensData.cob = Math.max(previous.cob - autosensData.absorbed, 0d);
+                        autosensData.substractAbosorbedCarbs();
+                    }
+                    autosensData.removeOldCarbs(bgTime);
+                    autosensData.cob += autosensData.carbsFromBolus;
+                    autosensData.deviation = deviation;
+                    autosensData.bgi = bgi;
+                    autosensData.delta = delta;
+                    autosensData.avgDelta = avgDelta;
+                    autosensData.avgDeviation = avgDeviation;
+                    autosensData.slopeFromMaxDeviation = slopeFromMaxDeviation;
+                    autosensData.slopeFromMinDeviation = slopeFromMinDeviation;
+
+
+                    // calculate autosens only without COB
+                    if (autosensData.cob <= 0) {
+                        if (Math.abs(deviation) < Constants.DEVIATION_TO_BE_EQUAL) {
+                            autosensData.pastSensitivity += "=";
+                            autosensData.nonEqualDeviation = true;
+                        } else if (deviation > 0) {
+                            autosensData.pastSensitivity += "+";
+                            autosensData.nonEqualDeviation = true;
+                        } else {
+                            autosensData.pastSensitivity += "-";
+                            autosensData.nonEqualDeviation = true;
+                        }
+                        autosensData.nonCarbsDeviation = true;
+                    } else {
+                        autosensData.pastSensitivity += "C";
+                    }
+                    //log.debug("TIME: " + new Date(bgTime).toString() + " BG: " + bg + " SENS: " + sens + " DELTA: " + delta + " AVGDELTA: " + avgDelta + " IOB: " + iob.iob + " ACTIVITY: " + iob.activity + " BGI: " + bgi + " DEVIATION: " + deviation);
+
+                    previous = autosensData;
+                    autosensDataTable.put(bgTime, autosensData);
+                    autosensData.autosensRatio = iobCobCalculatorPlugin.detectSensitivity(oldestTimeWithData, bgTime).ratio;
+                    if (Config.logAutosensData)
+                        log.debug(autosensData.log(bgTime));
+                }
+            }
+            MainApp.bus().post(new EventAutosensCalculationFinished(cause));
+            log.debug("Finishing calculation thread: " + from);
+        } finally {
+            mWakeLock.release();
+        }
+    }
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/events/EventAutosensCalculationFinished.java b/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/events/EventAutosensCalculationFinished.java
index ea73915436..2cb9b7ca4c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/events/EventAutosensCalculationFinished.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/events/EventAutosensCalculationFinished.java
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.IobCobCalculator.events;
 
+import info.nightscout.androidaps.events.Event;
 import info.nightscout.androidaps.events.EventLoop;
 
 /**
@@ -7,4 +8,9 @@ import info.nightscout.androidaps.events.EventLoop;
  */
 
 public class EventAutosensCalculationFinished extends EventLoop {
+    public Event cause;
+
+    public EventAutosensCalculationFinished(Event cause) {
+        this.cause = cause;
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Loop/APSResult.java b/app/src/main/java/info/nightscout/androidaps/plugins/Loop/APSResult.java
index f8ca0ab8c4..1550edd192 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Loop/APSResult.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Loop/APSResult.java
@@ -1,17 +1,22 @@
 package info.nightscout.androidaps.plugins.Loop;
 
-import android.os.Parcel;
-import android.os.Parcelable;
 import android.text.Html;
 import android.text.Spanned;
 
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.data.IobTotal;
+import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.utils.DecimalFormatter;
@@ -22,36 +27,64 @@ import info.nightscout.utils.DecimalFormatter;
 public class APSResult {
     private static Logger log = LoggerFactory.getLogger(APSResult.class);
 
+    public Date date;
     public String reason;
     public double rate;
     public int duration;
-    public boolean changeRequested = false;
+    public boolean tempBasalReqested = false;
+    public boolean bolusRequested = false;
+    public IobTotal iob;
+    public JSONObject json = new JSONObject();
+    public boolean hasPredictions = false;
+    public double smb = 0d; // super micro bolus in units
+    public long deliverAt = 0;
 
     @Override
     public String toString() {
         final PumpInterface pump = ConfigBuilderPlugin.getActivePump();
-        if (changeRequested) {
+        if (isChangeRequested()) {
+            String ret;
+            // rate
             if (rate == 0 && duration == 0)
-                return MainApp.sResources.getString(R.string.canceltemp);
+                ret = MainApp.sResources.getString(R.string.canceltemp) + "\n";
+            else if (rate == -1)
+                ret = MainApp.sResources.getString(R.string.let_temp_basal_run) + "\n";
             else
-                return MainApp.sResources.getString(R.string.rate) + ": " + DecimalFormatter.to2Decimal(rate) + " U/h " +
-                        "(" + DecimalFormatter.to2Decimal(rate / pump.getBaseBasalRate() * 100) + "%)\n" +
-                        MainApp.sResources.getString(R.string.duration) + ": " + DecimalFormatter.to0Decimal(duration) + " min\n" +
-                        MainApp.sResources.getString(R.string.reason) + ": " + reason;
+                ret = MainApp.sResources.getString(R.string.rate) + ": " + DecimalFormatter.to2Decimal(rate) + " U/h " +
+                        "(" + DecimalFormatter.to2Decimal(rate / pump.getBaseBasalRate() * 100) + "%) \n" +
+                        MainApp.sResources.getString(R.string.duration) + ": " + DecimalFormatter.to2Decimal(duration) + " min\n";
+
+            // smb
+            if (smb != 0)
+                ret += ("SMB: " + DecimalFormatter.to2Decimal(smb) + " U\n");
+
+            // reason
+            ret += MainApp.sResources.getString(R.string.reason) + ": " + reason;
+            return ret;
         } else
             return MainApp.sResources.getString(R.string.nochangerequested);
     }
 
     public Spanned toSpanned() {
         final PumpInterface pump = ConfigBuilderPlugin.getActivePump();
-        if (changeRequested) {
-            String ret = "";
-            if (rate == 0 && duration == 0) ret = MainApp.sResources.getString(R.string.canceltemp);
+        if (isChangeRequested()) {
+            String ret;
+            // rate
+            if (rate == 0 && duration == 0)
+                ret = MainApp.sResources.getString(R.string.canceltemp) + "<br>";
+            else if (rate == -1)
+                ret = MainApp.sResources.getString(R.string.let_temp_basal_run) + "<br>";
             else
                 ret = "<b>" + MainApp.sResources.getString(R.string.rate) + "</b>: " + DecimalFormatter.to2Decimal(rate) + " U/h " +
-                        "(" + DecimalFormatter.to2Decimal(rate / pump.getBaseBasalRate() * 100) + "%) <br>" +
-                        "<b>" + MainApp.sResources.getString(R.string.duration) + "</b>: " + DecimalFormatter.to2Decimal(duration) + " min<br>" +
-                        "<b>" + MainApp.sResources.getString(R.string.reason) + "</b>: " + reason.replace("<", "&lt;").replace(">", "&gt;");
+                      "(" + DecimalFormatter.to2Decimal(rate / pump.getBaseBasalRate() * 100) + "%) <br>" +
+                      "<b>" + MainApp.sResources.getString(R.string.duration) + "</b>: " + DecimalFormatter.to2Decimal(duration) + " min<br>";
+
+            // smb
+            if (smb != 0)
+                ret += ("<b>" + "SMB" + "</b>: " + DecimalFormatter.to2Decimal(smb) + " U<br>");
+
+            // reason
+            ret += "<b>" + MainApp.sResources.getString(R.string.reason) + "</b>: " + reason.replace("<", "&lt;").replace(">", "&gt;");
             return Html.fromHtml(ret);
         } else
             return Html.fromHtml(MainApp.sResources.getString(R.string.nochangerequested));
@@ -62,17 +95,19 @@ public class APSResult {
 
     public APSResult clone() {
         APSResult newResult = new APSResult();
-        newResult.reason = new String(reason);
+        newResult.reason = reason;
         newResult.rate = rate;
         newResult.duration = duration;
-        newResult.changeRequested = changeRequested;
+        newResult.tempBasalReqested = tempBasalReqested;
+        newResult.bolusRequested = bolusRequested;
+        newResult.iob = iob;
         return newResult;
     }
 
     public JSONObject json() {
         JSONObject json = new JSONObject();
         try {
-            if (changeRequested) {
+            if (isChangeRequested()) {
                 json.put("rate", rate);
                 json.put("duration", duration);
                 json.put("reason", reason);
@@ -82,4 +117,105 @@ public class APSResult {
         }
         return json;
     }
+
+    public List<BgReading> getPredictions() {
+        List<BgReading> array = new ArrayList<>();
+        try {
+            long startTime = date.getTime();
+            if (json.has("predBGs")) {
+                JSONObject predBGs = json.getJSONObject("predBGs");
+                if (predBGs.has("IOB")) {
+                    JSONArray iob = predBGs.getJSONArray("IOB");
+                    for (int i = 1; i < iob.length(); i++) {
+                        BgReading bg = new BgReading();
+                        bg.value = iob.getInt(i);
+                        bg.date = startTime + i * 5 * 60 * 1000L;
+                        bg.isIOBPrediction = true;
+                        array.add(bg);
+                    }
+                }
+                if (predBGs.has("aCOB")) {
+                    JSONArray iob = predBGs.getJSONArray("aCOB");
+                    for (int i = 1; i < iob.length(); i++) {
+                        BgReading bg = new BgReading();
+                        bg.value = iob.getInt(i);
+                        bg.date = startTime + i * 5 * 60 * 1000L;
+                        bg.isaCOBPrediction = true;
+                        array.add(bg);
+                    }
+                }
+                if (predBGs.has("COB")) {
+                    JSONArray iob = predBGs.getJSONArray("COB");
+                    for (int i = 1; i < iob.length(); i++) {
+                        BgReading bg = new BgReading();
+                        bg.value = iob.getInt(i);
+                        bg.date = startTime + i * 5 * 60 * 1000L;
+                        bg.isCOBPrediction = true;
+                        array.add(bg);
+                    }
+                }
+                if (predBGs.has("UAM")) {
+                    JSONArray iob = predBGs.getJSONArray("UAM");
+                    for (int i = 1; i < iob.length(); i++) {
+                        BgReading bg = new BgReading();
+                        bg.value = iob.getInt(i);
+                        bg.date = startTime + i * 5 * 60 * 1000L;
+                        bg.isUAMPrediction = true;
+                        array.add(bg);
+                    }
+                }
+                if (predBGs.has("ZT")) {
+                    JSONArray iob = predBGs.getJSONArray("ZT");
+                    for (int i = 1; i < iob.length(); i++) {
+                        BgReading bg = new BgReading();
+                        bg.value = iob.getInt(i);
+                        bg.date = startTime + i * 5 * 60 * 1000L;
+                        bg.isZTPrediction = true;
+                        array.add(bg);
+                    }
+                }
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return array;
+    }
+
+    public long getLatestPredictionsTime() {
+        long latest = 0;
+        try {
+            long startTime = date.getTime();
+            if (json.has("predBGs")) {
+                JSONObject predBGs = json.getJSONObject("predBGs");
+                if (predBGs.has("IOB")) {
+                    JSONArray iob = predBGs.getJSONArray("IOB");
+                    latest = Math.max(latest, startTime + (iob.length() - 1) * 5 * 60 * 1000L);
+                }
+                if (predBGs.has("aCOB")) {
+                    JSONArray iob = predBGs.getJSONArray("aCOB");
+                    latest = Math.max(latest, startTime + (iob.length() - 1) * 5 * 60 * 1000L);
+                }
+                if (predBGs.has("COB")) {
+                    JSONArray iob = predBGs.getJSONArray("COB");
+                    latest = Math.max(latest, startTime + (iob.length() - 1) * 5 * 60 * 1000L);
+                }
+                if (predBGs.has("UAM")) {
+                    JSONArray iob = predBGs.getJSONArray("UAM");
+                    latest = Math.max(latest, startTime + (iob.length() - 1) * 5 * 60 * 1000L);
+                }
+                if (predBGs.has("ZT")) {
+                    JSONArray iob = predBGs.getJSONArray("ZT");
+                    latest = Math.max(latest, startTime + (iob.length() - 1) * 5 * 60 * 1000L);
+                }
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        return latest;
+    }
+
+    public boolean isChangeRequested() {
+        return tempBasalReqested || bolusRequested;
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java
index 539b9991a3..2debfa34c5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java
@@ -6,7 +6,7 @@ import android.app.PendingIntent;
 import android.app.TaskStackBuilder;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v7.app.NotificationCompat;
+import android.support.v4.app.NotificationCompat;
 
 import com.crashlytics.android.answers.Answers;
 import com.crashlytics.android.answers.CustomEvent;
@@ -30,9 +30,12 @@ import info.nightscout.androidaps.interfaces.ConstraintsInterface;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
+import info.nightscout.androidaps.plugins.IobCobCalculator.events.EventAutosensCalculationFinished;
+import info.nightscout.androidaps.plugins.Loop.events.EventLoopResult;
 import info.nightscout.androidaps.plugins.Loop.events.EventLoopSetLastRunGui;
 import info.nightscout.androidaps.plugins.Loop.events.EventLoopUpdateGui;
 import info.nightscout.androidaps.plugins.Loop.events.EventNewOpenLoopNotification;
+import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.utils.NSUpload;
 import info.nightscout.utils.SP;
@@ -148,12 +151,16 @@ public class LoopPlugin implements PluginBase {
 
     @Subscribe
     public void onStatusEvent(final EventTreatmentChange ev) {
-        invoke("EventTreatmentChange", true);
+        if (ev.treatment == null || !ev.treatment.isSMB){
+            invoke("EventTreatmentChange", true);
+        }
     }
 
     @Subscribe
-    public void onStatusEvent(final EventNewBG ev) {
-        invoke("EventNewBG", true);
+    public void onStatusEvent(final EventAutosensCalculationFinished ev) {
+        if (ev.cause instanceof EventNewBG) {
+            invoke(ev.getClass().getSimpleName() + "(" + ev.cause.getClass().getSimpleName() + ")", true);
+        }
     }
 
     public long suspendedTo() {
@@ -283,6 +290,14 @@ public class LoopPlugin implements PluginBase {
             // check rate for constrais
             final APSResult resultAfterConstraints = result.clone();
             resultAfterConstraints.rate = constraintsInterface.applyBasalConstraints(resultAfterConstraints.rate);
+            resultAfterConstraints.smb = constraintsInterface.applyBolusConstraints(resultAfterConstraints.smb);
+
+            // safety check for multiple SMBs
+            long lastBolusTime = TreatmentsPlugin.getPlugin().getLastBolusTime();
+            if (lastBolusTime != 0 && lastBolusTime + 3 * 60 * 1000 > System.currentTimeMillis()) {
+                log.debug("SMB requsted but still in 3 min interval");
+                resultAfterConstraints.smb = 0;
+            }
 
             if (lastRun == null) lastRun = new LastRun();
             lastRun.request = result;
@@ -305,8 +320,10 @@ public class LoopPlugin implements PluginBase {
                 return;
             }
 
+            MainApp.bus().post(new EventLoopResult(resultAfterConstraints));
+
             if (constraintsInterface.isClosedModeEnabled()) {
-                if (result.changeRequested) {
+                if (result.isChangeRequested()) {
                     final PumpEnactResult waiting = new PumpEnactResult();
                     final PumpEnactResult previousResult = lastRun.setByPump;
                     waiting.queued = true;
@@ -330,7 +347,7 @@ public class LoopPlugin implements PluginBase {
                     lastRun.source = null;
                 }
             } else {
-                if (result.changeRequested && allowNotification) {
+                if (result.isChangeRequested() && allowNotification) {
                     NotificationCompat.Builder builder =
                             new NotificationCompat.Builder(MainApp.instance().getApplicationContext());
                     builder.setSmallIcon(R.drawable.notif_icon)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Loop/events/EventLoopResult.java b/app/src/main/java/info/nightscout/androidaps/plugins/Loop/events/EventLoopResult.java
new file mode 100644
index 0000000000..5cbb24ea22
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Loop/events/EventLoopResult.java
@@ -0,0 +1,12 @@
+package info.nightscout.androidaps.plugins.Loop.events;
+
+import info.nightscout.androidaps.plugins.Loop.APSResult;
+
+public class EventLoopResult {
+    public final APSResult apsResult;
+
+    public EventLoopResult(APSResult apsResult) {
+        this.apsResult = apsResult;
+    }
+}
+
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSDeviceStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSDeviceStatus.java
index 315e9724ce..d1755dd4c1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSDeviceStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSDeviceStatus.java
@@ -124,7 +124,7 @@ public class NSDeviceStatus {
     static DeviceStatusPumpData deviceStatusPumpData = null;
 
     public Spanned getExtendedPumpStatus() {
-        if (deviceStatusPumpData.extended != null)
+        if (deviceStatusPumpData != null && deviceStatusPumpData.extended != null)
             return deviceStatusPumpData.extended;
         return Html.fromHtml("");
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalAdapterAMAJS.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalAdapterAMAJS.java
index 466026e986..66d3ab2b96 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalAdapterAMAJS.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalAdapterAMAJS.java
@@ -29,6 +29,7 @@ import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.plugins.Loop.ScriptReader;
 import info.nightscout.androidaps.plugins.OpenAPSMA.LoggerCallback;
+import info.nightscout.androidaps.plugins.OpenAPSSMB.SMBDefaults;
 import info.nightscout.utils.SP;
 
 public class DetermineBasalAdapterAMAJS {
@@ -189,8 +190,7 @@ public class DetermineBasalAdapterAMAJS {
                         GlucoseStatus glucoseStatus,
                         MealData mealData,
                         double autosensDataRatio,
-                        boolean tempTargetSet,
-                        double min_5m_carbimpact) throws JSONException {
+                        boolean tempTargetSet) throws JSONException {
 
         String units = profile.getUnits();
 
@@ -211,7 +211,7 @@ public class DetermineBasalAdapterAMAJS {
         mProfile.put("current_basal", basalrate);
         mProfile.put("temptargetSet", tempTargetSet);
         mProfile.put("autosens_adjust_targets", SP.getBoolean("openapsama_autosens_adjusttargets", true));
-        mProfile.put("min_5m_carbimpact", SP.getDouble("openapsama_min_5m_carbimpact", 3d));
+        mProfile.put("min_5m_carbimpact", SP.getInt("openapsama_min_5m_carbimpact", SMBDefaults.min_5m_carbimpact));
 
         if (units.equals(Constants.MMOL)) {
             mProfile.put("out_units", "mmol/L");
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java
index e4c23ae043..50dde42674 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java
@@ -1,35 +1,28 @@
 package info.nightscout.androidaps.plugins.OpenAPSAMA;
 
-import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.mozilla.javascript.NativeObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
 
-import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.plugins.Loop.APSResult;
-import info.nightscout.androidaps.data.IobTotal;
 
 public class DetermineBasalResultAMA extends APSResult {
     private static Logger log = LoggerFactory.getLogger(DetermineBasalResultAMA.class);
 
-    public Date date;
-    public JSONObject json = new JSONObject();
     public double eventualBG;
     public double snoozeBG;
-    public IobTotal iob;
 
     public DetermineBasalResultAMA(NativeObject result, JSONObject j) {
+        this();
         date = new Date();
         json = j;
         if (result.containsKey("error")) {
             reason = result.get("error").toString();
-            changeRequested = false;
+            tempBasalReqested = false;
             rate = -1;
             duration = -1;
         } else {
@@ -37,36 +30,37 @@ public class DetermineBasalResultAMA extends APSResult {
             if (result.containsKey("eventualBG")) eventualBG = (Double) result.get("eventualBG");
             if (result.containsKey("snoozeBG")) snoozeBG = (Double) result.get("snoozeBG");
             if (result.containsKey("rate")) {
-                rate =  (Double) result.get("rate");
+                rate = (Double) result.get("rate");
                 if (rate < 0d) rate = 0d;
-                changeRequested = true;
+                tempBasalReqested = true;
             } else {
                 rate = -1;
-                changeRequested = false;
+                tempBasalReqested = false;
             }
             if (result.containsKey("duration")) {
-                duration = ((Double)result.get("duration")).intValue();
+                duration = ((Double) result.get("duration")).intValue();
                 //changeRequested as above
             } else {
                 duration = -1;
-                changeRequested = false;
+                tempBasalReqested = false;
             }
         }
+        bolusRequested = false;
     }
 
     public DetermineBasalResultAMA() {
+        hasPredictions = true;
     }
 
     @Override
     public DetermineBasalResultAMA clone() {
         DetermineBasalResultAMA newResult = new DetermineBasalResultAMA();
-        newResult.reason = new String(reason);
+        newResult.reason = reason;
         newResult.rate = rate;
         newResult.duration = duration;
-        newResult.changeRequested = changeRequested;
+        newResult.tempBasalReqested = tempBasalReqested;
         newResult.rate = rate;
         newResult.duration = duration;
-        newResult.changeRequested = changeRequested;
 
         try {
             newResult.json = new JSONObject(json.toString());
@@ -90,72 +84,4 @@ public class DetermineBasalResultAMA extends APSResult {
         return null;
     }
 
-    public List<BgReading> getPredictions() {
-        List<BgReading> array = new ArrayList<>();
-        try {
-            long startTime = date.getTime();
-            if (json.has("predBGs")) {
-                JSONObject predBGs = json.getJSONObject("predBGs");
-                if (predBGs.has("IOB")) {
-                    JSONArray iob = predBGs.getJSONArray("IOB");
-                    for (int i = 1; i < iob.length(); i ++) {
-                        BgReading bg = new BgReading();
-                        bg.value = iob.getInt(i);
-                        bg.date = startTime + i * 5 * 60 * 1000L;
-                        bg.isPrediction = true;
-                        array.add(bg);
-                    }
-                }
-                if (predBGs.has("aCOB")) {
-                    JSONArray iob = predBGs.getJSONArray("aCOB");
-                    for (int i = 1; i < iob.length(); i ++) {
-                        BgReading bg = new BgReading();
-                        bg.value = iob.getInt(i);
-                        bg.date = startTime + i * 5 * 60 * 1000L;
-                        bg.isPrediction = true;
-                        array.add(bg);
-                    }
-                }
-                if (predBGs.has("COB")) {
-                    JSONArray iob = predBGs.getJSONArray("COB");
-                    for (int i = 1; i < iob.length(); i ++) {
-                        BgReading bg = new BgReading();
-                        bg.value = iob.getInt(i);
-                        bg.date = startTime + i * 5 * 60 * 1000L;
-                        bg.isPrediction = true;
-                        array.add(bg);
-                    }
-                }
-            }
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return array;
-    }
-
-    public long getLatestPredictionsTime() {
-        long latest = 0;
-        try {
-            long startTime = date.getTime();
-            if (json.has("predBGs")) {
-                JSONObject predBGs = json.getJSONObject("predBGs");
-                if (predBGs.has("IOB")) {
-                    JSONArray iob = predBGs.getJSONArray("IOB");
-                    latest = Math.max(latest, startTime + (iob.length() - 1) * 5 * 60 * 1000L);
-                }
-                if (predBGs.has("aCOB")) {
-                    JSONArray iob = predBGs.getJSONArray("aCOB");
-                    latest = Math.max(latest, startTime + (iob.length() - 1) * 5 * 60 * 1000L);
-                }
-                if (predBGs.has("COB")) {
-                    JSONArray iob = predBGs.getJSONArray("COB");
-                    latest = Math.max(latest, startTime + (iob.length() - 1) * 5 * 60 * 1000L);
-                }
-            }
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-
-        return latest;
-    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAPlugin.java
index 4c14f33533..14d5396817 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/OpenAPSAMAPlugin.java
@@ -30,7 +30,6 @@ import info.nightscout.utils.NSUpload;
 import info.nightscout.utils.Profiler;
 import info.nightscout.utils.Round;
 import info.nightscout.utils.SP;
-import info.nightscout.utils.SafeParse;
 import info.nightscout.utils.ToastUtils;
 
 /**
@@ -233,8 +232,7 @@ public class OpenAPSAMAPlugin implements PluginBase, APSInterface {
         try {
             determineBasalAdapterAMAJS.setData(profile, maxIob, maxBasal, minBg, maxBg, targetBg, ConfigBuilderPlugin.getActivePump().getBaseBasalRate(), iobArray, glucoseStatus, mealData,
                     lastAutosensResult.ratio, //autosensDataRatio
-                    isTempTarget,
-                    SafeParse.stringToDouble(SP.getString("openapsama_min_5m_carbimpact", "3.0"))//min_5m_carbimpact
+                    isTempTarget
             );
         } catch (JSONException e) {
             log.error("Unable to set data: " + e.toString());
@@ -245,15 +243,15 @@ public class OpenAPSAMAPlugin implements PluginBase, APSInterface {
         Profiler.log(log, "AMA calculation", start);
         // Fix bug determine basal
         if (determineBasalResultAMA.rate == 0d && determineBasalResultAMA.duration == 0 && !MainApp.getConfigBuilder().isTempBasalInProgress())
-            determineBasalResultAMA.changeRequested = false;
+            determineBasalResultAMA.tempBasalReqested = false;
         // limit requests on openloop mode
         if (!MainApp.getConfigBuilder().isClosedModeEnabled()) {
             if (MainApp.getConfigBuilder().isTempBasalInProgress() && determineBasalResultAMA.rate == 0 && determineBasalResultAMA.duration == 0) {
                 // going to cancel
             } else if (MainApp.getConfigBuilder().isTempBasalInProgress() && Math.abs(determineBasalResultAMA.rate - MainApp.getConfigBuilder().getTempBasalAbsoluteRateHistory()) < 0.1) {
-                determineBasalResultAMA.changeRequested = false;
+                determineBasalResultAMA.tempBasalReqested = false;
             } else if (!MainApp.getConfigBuilder().isTempBasalInProgress() && Math.abs(determineBasalResultAMA.rate - ConfigBuilderPlugin.getActivePump().getBaseBasalRate()) < 0.1)
-                determineBasalResultAMA.changeRequested = false;
+                determineBasalResultAMA.tempBasalReqested = false;
         }
 
         determineBasalResultAMA.iob = iobArray[0];
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalResultMA.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalResultMA.java
index e132c9f953..3f40c02980 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalResultMA.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalResultMA.java
@@ -6,7 +6,6 @@ import org.mozilla.javascript.NativeObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.plugins.Loop.APSResult;
 
 public class DetermineBasalResultMA extends APSResult {
@@ -16,13 +15,12 @@ public class DetermineBasalResultMA extends APSResult {
     public double eventualBG;
     public double snoozeBG;
     public String mealAssist;
-    public IobTotal iob;
 
     public DetermineBasalResultMA(NativeObject result, JSONObject j) {
         json = j;
         if (result.containsKey("error")) {
             reason = (String) result.get("error");
-            changeRequested = false;
+            tempBasalReqested = false;
             rate = -1;
             duration = -1;
             mealAssist = "";
@@ -33,17 +31,17 @@ public class DetermineBasalResultMA extends APSResult {
             if (result.containsKey("rate")) {
                 rate = (Double) result.get("rate");
                 if (rate < 0d) rate = 0d;
-                changeRequested = true;
+                tempBasalReqested = true;
             } else {
                 rate = -1;
-                changeRequested = false;
+                tempBasalReqested = false;
             }
             if (result.containsKey("duration")) {
                 duration = ((Double) result.get("duration")).intValue();
                 //changeRequested as above
             } else {
                 duration = -1;
-                changeRequested = false;
+                tempBasalReqested = false;
             }
             if (result.containsKey("mealAssist")) {
                 mealAssist = result.get("mealAssist").toString();
@@ -60,10 +58,10 @@ public class DetermineBasalResultMA extends APSResult {
         newResult.reason = new String(reason);
         newResult.rate = rate;
         newResult.duration = duration;
-        newResult.changeRequested = changeRequested;
+        newResult.tempBasalReqested = isChangeRequested();
         newResult.rate = rate;
         newResult.duration = duration;
-        newResult.changeRequested = changeRequested;
+        newResult.tempBasalReqested = isChangeRequested();
 
         try {
             newResult.json = new JSONObject(json.toString());
@@ -72,7 +70,7 @@ public class DetermineBasalResultMA extends APSResult {
         }
         newResult.eventualBG = eventualBG;
         newResult.snoozeBG = snoozeBG;
-        newResult.mealAssist = new String(mealAssist);
+        newResult.mealAssist = mealAssist;
         return newResult;
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAPlugin.java
index d56dc44b89..3119a17a96 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/OpenAPSMAPlugin.java
@@ -229,15 +229,15 @@ public class OpenAPSMAPlugin implements PluginBase, APSInterface {
         DetermineBasalResultMA determineBasalResultMA = determineBasalAdapterMAJS.invoke();
         // Fix bug determinef basal
         if (determineBasalResultMA.rate == 0d && determineBasalResultMA.duration == 0 && !MainApp.getConfigBuilder().isTempBasalInProgress())
-            determineBasalResultMA.changeRequested = false;
+            determineBasalResultMA.tempBasalReqested = false;
         // limit requests on openloop mode
         if (!MainApp.getConfigBuilder().isClosedModeEnabled()) {
             if (MainApp.getConfigBuilder().isTempBasalInProgress() && determineBasalResultMA.rate == 0 && determineBasalResultMA.duration == 0) {
                 // going to cancel
             } else if (MainApp.getConfigBuilder().isTempBasalInProgress() && Math.abs(determineBasalResultMA.rate - MainApp.getConfigBuilder().getTempBasalAbsoluteRateHistory()) < 0.1) {
-                determineBasalResultMA.changeRequested = false;
+                determineBasalResultMA.tempBasalReqested = false;
             } else if (!MainApp.getConfigBuilder().isTempBasalInProgress() && Math.abs(determineBasalResultMA.rate - ConfigBuilderPlugin.getActivePump().getBaseBasalRate()) < 0.1)
-                determineBasalResultMA.changeRequested = false;
+                determineBasalResultMA.tempBasalReqested = false;
         }
 
         determineBasalResultMA.iob = iobTotal;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/DetermineBasalAdapterSMBJS.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/DetermineBasalAdapterSMBJS.java
new file mode 100644
index 0000000000..57c879a5cd
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/DetermineBasalAdapterSMBJS.java
@@ -0,0 +1,344 @@
+package info.nightscout.androidaps.plugins.OpenAPSSMB;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.mozilla.javascript.Callable;
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.Function;
+import org.mozilla.javascript.NativeJSON;
+import org.mozilla.javascript.NativeObject;
+import org.mozilla.javascript.RhinoException;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
+import org.mozilla.javascript.Undefined;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+
+import info.nightscout.androidaps.Config;
+import info.nightscout.androidaps.Constants;
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.data.GlucoseStatus;
+import info.nightscout.androidaps.data.IobTotal;
+import info.nightscout.androidaps.data.MealData;
+import info.nightscout.androidaps.data.Profile;
+import info.nightscout.androidaps.db.TemporaryBasal;
+import info.nightscout.androidaps.interfaces.PluginBase;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
+import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin;
+import info.nightscout.androidaps.plugins.Loop.ScriptReader;
+import info.nightscout.androidaps.plugins.OpenAPSMA.LoggerCallback;
+import info.nightscout.androidaps.plugins.SourceDexcomG5.SourceDexcomG5Plugin;
+import info.nightscout.utils.SP;
+import info.nightscout.utils.SafeParse;
+
+public class DetermineBasalAdapterSMBJS {
+    private static Logger log = LoggerFactory.getLogger(DetermineBasalAdapterSMBJS.class);
+
+
+    private ScriptReader mScriptReader = null;
+    private JSONObject mProfile;
+    private JSONObject mGlucoseStatus;
+    private JSONArray mIobData;
+    private JSONObject mMealData;
+    private JSONObject mCurrentTemp;
+    private JSONObject mAutosensData = null;
+    private boolean mMicrobolusAllowed;
+
+    private String storedCurrentTemp = null;
+    private String storedIobData = null;
+
+    private String storedGlucoseStatus = null;
+    private String storedProfile = null;
+    private String storedMeal_data = null;
+    private String storedAutosens_data = null;
+    private String storedMicroBolusAllowed = null;
+
+    private String scriptDebug = "";
+
+    /**
+     * Main code
+     */
+
+    public DetermineBasalAdapterSMBJS(ScriptReader scriptReader) throws IOException {
+        mScriptReader = scriptReader;
+    }
+
+
+    public DetermineBasalResultSMB invoke() {
+
+
+        log.debug(">>> Invoking detemine_basal <<<");
+        log.debug("Glucose status: " + (storedGlucoseStatus = mGlucoseStatus.toString()));
+        log.debug("IOB data:       " + (storedIobData = mIobData.toString()));
+        log.debug("Current temp:   " + (storedCurrentTemp = mCurrentTemp.toString()));
+        log.debug("Profile:        " + (storedProfile = mProfile.toString()));
+        log.debug("Meal data:      " + (storedMeal_data = mMealData.toString()));
+        if (mAutosensData != null)
+            log.debug("Autosens data:  " + (storedAutosens_data = mAutosensData.toString()));
+        else
+            log.debug("Autosens data:  " + (storedAutosens_data = "undefined"));
+        log.debug("Reservoir data: " + "undefined");
+        log.debug("MicroBolusAllowed:  " + (storedMicroBolusAllowed = "" + mMicrobolusAllowed));
+
+        DetermineBasalResultSMB determineBasalResultSMB = null;
+
+        Context rhino = Context.enter();
+        Scriptable scope = rhino.initStandardObjects();
+        // Turn off optimization to make Rhino Android compatible
+        rhino.setOptimizationLevel(-1);
+
+        try {
+
+            //register logger callback for console.log and console.error
+            ScriptableObject.defineClass(scope, LoggerCallback.class);
+            Scriptable myLogger = rhino.newObject(scope, "LoggerCallback", null);
+            scope.put("console2", scope, myLogger);
+            rhino.evaluateString(scope, readFile("OpenAPSAMA/loggerhelper.js"), "JavaScript", 0, null);
+
+            //set module parent
+            rhino.evaluateString(scope, "var module = {\"parent\":Boolean(1)};", "JavaScript", 0, null);
+            rhino.evaluateString(scope, "var round_basal = function round_basal(basal, profile) { return basal; };", "JavaScript", 0, null);
+            rhino.evaluateString(scope, "require = function() {return round_basal;};", "JavaScript", 0, null);
+
+            //generate functions "determine_basal" and "setTempBasal"
+            rhino.evaluateString(scope, readFile("OpenAPSSMB/determine-basal.js"), "JavaScript", 0, null);
+            rhino.evaluateString(scope, readFile("OpenAPSSMB/basal-set-temp.js"), "setTempBasal.js", 0, null);
+            Object determineBasalObj = scope.get("determine_basal", scope);
+            Object setTempBasalFunctionsObj = scope.get("tempBasalFunctions", scope);
+
+            //call determine-basal
+            if (determineBasalObj instanceof Function && setTempBasalFunctionsObj instanceof NativeObject) {
+                Function determineBasalJS = (Function) determineBasalObj;
+
+                //prepare parameters
+                Object[] params = new Object[]{
+                        makeParam(mGlucoseStatus, rhino, scope),
+                        makeParam(mCurrentTemp, rhino, scope),
+                        makeParamArray(mIobData, rhino, scope),
+                        makeParam(mProfile, rhino, scope),
+                        makeParam(mAutosensData, rhino, scope),
+                        makeParam(mMealData, rhino, scope),
+                        setTempBasalFunctionsObj,
+                        new Boolean(mMicrobolusAllowed),
+                        makeParam(null, rhino, scope) // reservoir data as undefined
+                };
+
+
+                NativeObject jsResult = (NativeObject) determineBasalJS.call(rhino, scope, scope, params);
+                scriptDebug = LoggerCallback.getScriptDebug();
+
+                // Parse the jsResult object to a JSON-String
+                String result = NativeJSON.stringify(rhino, scope, jsResult, null, null).toString();
+                if (Config.logAPSResult)
+                    log.debug("Result: " + result);
+                try {
+                    determineBasalResultSMB = new DetermineBasalResultSMB(new JSONObject(result));
+                } catch (JSONException e) {
+                    log.error("Unhandled exception", e);
+                }
+            } else {
+                log.debug("Problem loading JS Functions");
+            }
+        } catch (IOException e) {
+            log.debug("IOException");
+        } catch (RhinoException e) {
+            log.error("RhinoException: (" + e.lineNumber() + "," + e.columnNumber() + ") " + e.toString());
+        } catch (IllegalAccessException e) {
+            log.error(e.toString());
+        } catch (InstantiationException e) {
+            log.error(e.toString());
+        } catch (InvocationTargetException e) {
+            log.error(e.toString());
+        } finally {
+            Context.exit();
+        }
+
+        storedGlucoseStatus = mGlucoseStatus.toString();
+        storedIobData = mIobData.toString();
+        storedCurrentTemp = mCurrentTemp.toString();
+        storedProfile = mProfile.toString();
+        storedMeal_data = mMealData.toString();
+
+        return determineBasalResultSMB;
+
+    }
+
+    String getGlucoseStatusParam() {
+        return storedGlucoseStatus;
+    }
+
+    String getCurrentTempParam() {
+        return storedCurrentTemp;
+    }
+
+    String getIobDataParam() {
+        return storedIobData;
+    }
+
+    String getProfileParam() {
+        return storedProfile;
+    }
+
+    String getMealDataParam() {
+        return storedMeal_data;
+    }
+
+    String getAutosensDataParam() {
+        return storedAutosens_data;
+    }
+
+    String getMicroBolusAllowedParam() {
+        return storedMicroBolusAllowed;
+    }
+
+    String getScriptDebug() {
+        return scriptDebug;
+    }
+
+    public void setData(Profile profile,
+                        double maxIob,
+                        double maxBasal,
+                        double minBg,
+                        double maxBg,
+                        double targetBg,
+                        double basalrate,
+                        IobTotal[] iobArray,
+                        GlucoseStatus glucoseStatus,
+                        MealData mealData,
+                        double autosensDataRatio,
+                        boolean tempTargetSet,
+                        boolean microBolusAllowed
+    ) throws JSONException {
+
+        String units = profile.getUnits();
+
+        mProfile = new JSONObject();
+
+        mProfile.put("max_iob", maxIob);
+        mProfile.put("dia", profile.getDia());
+        mProfile.put("type", "current");
+        mProfile.put("max_daily_basal", profile.getMaxDailyBasal());
+        mProfile.put("max_basal", maxBasal);
+        mProfile.put("min_bg", minBg);
+        mProfile.put("max_bg", maxBg);
+        mProfile.put("target_bg", targetBg);
+        mProfile.put("carb_ratio", profile.getIc());
+        mProfile.put("sens", Profile.toMgdl(profile.getIsf().doubleValue(), units));
+        mProfile.put("max_daily_safety_multiplier", SP.getInt("openapsama_max_daily_safety_multiplier", 3));
+        mProfile.put("current_basal_safety_multiplier", SP.getInt("openapsama_current_basal_safety_multiplier", 4));
+
+        mProfile.put("high_temptarget_raises_sensitivity", SMBDefaults.high_temptarget_raises_sensitivity);
+        mProfile.put("low_temptarget_lowers_sensitivity", SMBDefaults.low_temptarget_lowers_sensitivity);
+        mProfile.put("sensitivity_raises_target", SMBDefaults.sensitivity_raises_target);
+        mProfile.put("resistance_lowers_target", SMBDefaults.resistance_lowers_target);
+        mProfile.put("adv_target_adjustments", SMBDefaults.adv_target_adjustments);
+        mProfile.put("exercise_mode", SMBDefaults.exercise_mode);
+        mProfile.put("half_basal_exercise_target", SMBDefaults.half_basal_exercise_target);
+        mProfile.put("maxCOB", SMBDefaults.maxCOB);
+        mProfile.put("skip_neutral_temps", SMBDefaults.skip_neutral_temps);
+        mProfile.put("min_5m_carbimpact", SP.getInt("openapsama_min_5m_carbimpact", SMBDefaults.min_5m_carbimpact));;
+        mProfile.put("remainingCarbsCap", SMBDefaults.remainingCarbsCap);
+        mProfile.put("enableUAM", SP.getBoolean(R.string.key_use_uam, false));
+        mProfile.put("A52_risk_enable", SMBDefaults.A52_risk_enable);
+        mProfile.put("enableSMB_with_COB", SP.getBoolean(R.string.key_use_smb, false) && SP.getBoolean(R.string.key_enableSMB_with_COB, false));
+        mProfile.put("enableSMB_with_temptarget", SP.getBoolean(R.string.key_use_smb, false) && SP.getBoolean(R.string.key_enableSMB_with_temptarget, false));
+        mProfile.put("allowSMB_with_high_temptarget", SP.getBoolean(R.string.key_use_smb, false) && SP.getBoolean(R.string.key_allowSMB_with_high_temptarget, false));
+        mProfile.put("enableSMB_always", SP.getBoolean(R.string.key_use_smb, false) && SP.getBoolean(R.string.key_enableSMB_always, false) && ConfigBuilderPlugin.getActiveBgSource().advancedFilteringSupported());
+        mProfile.put("enableSMB_after_carbs", SP.getBoolean(R.string.key_use_smb, false) && SP.getBoolean(R.string.key_enableSMB_after_carbs, false) && ConfigBuilderPlugin.getActiveBgSource().advancedFilteringSupported());
+        mProfile.put("maxSMBBasalMinutes", SP.getInt("key_smbmaxminutes", SMBDefaults.maxSMBBasalMinutes));
+        mProfile.put("carbsReqThreshold", SMBDefaults.carbsReqThreshold);
+
+        mProfile.put("current_basal", basalrate);
+        mProfile.put("temptargetSet", tempTargetSet);
+        mProfile.put("autosens_max", SafeParse.stringToDouble(SP.getString("openapsama_autosens_max", "1.2")));
+
+        if (units.equals(Constants.MMOL)) {
+            mProfile.put("out_units", "mmol/L");
+        }
+
+
+        mCurrentTemp = new JSONObject();
+        mCurrentTemp.put("temp", "absolute");
+        mCurrentTemp.put("duration", MainApp.getConfigBuilder().getTempBasalRemainingMinutesFromHistory());
+        mCurrentTemp.put("rate", MainApp.getConfigBuilder().getTempBasalAbsoluteRateHistory());
+
+        // as we have non default temps longer than 30 mintues
+        TemporaryBasal tempBasal = MainApp.getConfigBuilder().getTempBasalFromHistory(System.currentTimeMillis());
+        if (tempBasal != null) {
+            mCurrentTemp.put("minutesrunning", tempBasal.getRealDuration());
+        }
+
+        mIobData = IobCobCalculatorPlugin.convertToJSONArray(iobArray);
+
+        mGlucoseStatus = new JSONObject();
+        mGlucoseStatus.put("glucose", glucoseStatus.glucose);
+
+        if (SP.getBoolean("always_use_shortavg", false)) {
+            mGlucoseStatus.put("delta", glucoseStatus.short_avgdelta);
+        } else {
+            mGlucoseStatus.put("delta", glucoseStatus.delta);
+        }
+        mGlucoseStatus.put("short_avgdelta", glucoseStatus.short_avgdelta);
+        mGlucoseStatus.put("long_avgdelta", glucoseStatus.long_avgdelta);
+        mGlucoseStatus.put("date", glucoseStatus.date);
+
+        mMealData = new JSONObject();
+        mMealData.put("carbs", mealData.carbs);
+        mMealData.put("boluses", mealData.boluses);
+        mMealData.put("mealCOB", mealData.mealCOB);
+        mMealData.put("slopeFromMaxDeviation", mealData.slopeFromMaxDeviation);
+        mMealData.put("slopeFromMinDeviation", mealData.slopeFromMinDeviation);
+        mMealData.put("lastBolusTime", mealData.lastBolusTime);
+        mMealData.put("lastCarbTime", mealData.lastCarbTime);
+
+
+        if (MainApp.getConfigBuilder().isAMAModeEnabled()) {
+            mAutosensData = new JSONObject();
+            mAutosensData.put("ratio", autosensDataRatio);
+        } else {
+            mAutosensData = new JSONObject();
+            mAutosensData.put("ratio", 1.0);
+        }
+        mMicrobolusAllowed = microBolusAllowed;
+
+    }
+
+    public Object makeParam(JSONObject jsonObject, Context rhino, Scriptable scope) {
+
+        if (jsonObject == null) return Undefined.instance;
+
+        Object param = NativeJSON.parse(rhino, scope, jsonObject.toString(), new Callable() {
+            @Override
+            public Object call(Context context, Scriptable scriptable, Scriptable scriptable1, Object[] objects) {
+                return objects[1];
+            }
+        });
+        return param;
+    }
+
+    public Object makeParamArray(JSONArray jsonArray, Context rhino, Scriptable scope) {
+        //Object param = NativeJSON.parse(rhino, scope, "{myarray: " + jsonArray.toString() + " }", new Callable() {
+        Object param = NativeJSON.parse(rhino, scope, jsonArray.toString(), new Callable() {
+            @Override
+            public Object call(Context context, Scriptable scriptable, Scriptable scriptable1, Object[] objects) {
+                return objects[1];
+            }
+        });
+        return param;
+    }
+
+    public String readFile(String filename) throws IOException {
+        byte[] bytes = mScriptReader.readFile(filename);
+        String string = new String(bytes, "UTF-8");
+        if (string.startsWith("#!/usr/bin/env node")) {
+            string = string.substring(20);
+        }
+        return string;
+    }
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/DetermineBasalResultSMB.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/DetermineBasalResultSMB.java
new file mode 100644
index 0000000000..0320b3633d
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/DetermineBasalResultSMB.java
@@ -0,0 +1,104 @@
+package info.nightscout.androidaps.plugins.OpenAPSSMB;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Date;
+
+import info.nightscout.androidaps.plugins.Loop.APSResult;
+import info.nightscout.utils.DateUtil;
+
+public class DetermineBasalResultSMB extends APSResult {
+    private static final Logger log = LoggerFactory.getLogger(DetermineBasalResultSMB.class);
+
+    public double eventualBG;
+    public double snoozeBG;
+    public double insulinReq;
+    public double carbsReq;
+
+    public DetermineBasalResultSMB(JSONObject result) {
+        this();
+        date = new Date();
+        json = result;
+        try {
+            if (result.has("error")) {
+                reason = result.getString("error");
+                return;
+            }
+
+            reason = result.getString("reason");
+            if (result.has("eventualBG")) eventualBG = result.getDouble("eventualBG");
+            if (result.has("snoozeBG")) snoozeBG = result.getDouble("snoozeBG");
+            if (result.has("insulinReq")) insulinReq = result.getDouble("insulinReq");
+            if (result.has("carbsReq")) carbsReq = result.getDouble("carbsReq");
+
+            if (result.has("rate") && result.has("duration")) {
+                tempBasalReqested = true;
+                rate = result.getDouble("rate");
+                if (rate < 0d) rate = 0d;
+                duration = result.getInt("duration");
+            } else {
+                rate = -1;
+                duration = -1;
+            }
+
+            if (result.has("units")) {
+                bolusRequested = true;
+                smb = result.getDouble("units");
+            } else {
+                smb = 0d;
+            }
+
+            if (result.has("deliverAt")) {
+                String date = result.getString("deliverAt");
+                try {
+                    deliverAt = DateUtil.fromISODateString(date).getTime();
+                } catch (Exception e) {
+                    log.warn("Error parsing 'deliverAt' date: " + date, e);
+                }
+            }
+        } catch (JSONException e) {
+            log.error("Error parsing determine-basal result JSON", e);
+        }
+    }
+
+    public DetermineBasalResultSMB() {
+        hasPredictions = true;
+    }
+
+    @Override
+    public DetermineBasalResultSMB clone() {
+        DetermineBasalResultSMB newResult = new DetermineBasalResultSMB();
+        newResult.reason = reason;
+        newResult.rate = rate;
+        newResult.duration = duration;
+        newResult.tempBasalReqested = tempBasalReqested;
+        newResult.bolusRequested = bolusRequested;
+        newResult.rate = rate;
+        newResult.duration = duration;
+        newResult.smb = smb;
+        newResult.deliverAt = deliverAt;
+
+        try {
+            newResult.json = new JSONObject(json.toString());
+        } catch (JSONException e) {
+            log.error("Error clone parsing determine-basal result", e);
+        }
+        newResult.eventualBG = eventualBG;
+        newResult.snoozeBG = snoozeBG;
+        newResult.date = date;
+        return newResult;
+    }
+
+    @Override
+    public JSONObject json() {
+        try {
+            return new JSONObject(this.json.toString());
+        } catch (JSONException e) {
+            log.error("Error converting determine-basal result to JSON", e);
+        }
+        return null;
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/OpenAPSSMBFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/OpenAPSSMBFragment.java
new file mode 100644
index 0000000000..ef515c68f2
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/OpenAPSSMBFragment.java
@@ -0,0 +1,142 @@
+package info.nightscout.androidaps.plugins.OpenAPSSMB;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.crashlytics.android.answers.Answers;
+import com.crashlytics.android.answers.CustomEvent;
+import com.squareup.otto.Subscribe;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
+import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateGui;
+import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateResultGui;
+import info.nightscout.utils.JSONFormatter;
+
+public class OpenAPSSMBFragment extends SubscriberFragment implements View.OnClickListener {
+    private static Logger log = LoggerFactory.getLogger(OpenAPSSMBFragment.class);
+
+    Button run;
+    TextView lastRunView;
+    TextView glucoseStatusView;
+    TextView currentTempView;
+    TextView iobDataView;
+    TextView profileView;
+    TextView mealDataView;
+    TextView autosensDataView;
+    TextView resultView;
+    TextView scriptdebugView;
+    TextView requestView;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.openapsama_fragment, container, false);
+
+        run = (Button) view.findViewById(R.id.openapsma_run);
+        run.setOnClickListener(this);
+        lastRunView = (TextView) view.findViewById(R.id.openapsma_lastrun);
+        glucoseStatusView = (TextView) view.findViewById(R.id.openapsma_glucosestatus);
+        currentTempView = (TextView) view.findViewById(R.id.openapsma_currenttemp);
+        iobDataView = (TextView) view.findViewById(R.id.openapsma_iobdata);
+        profileView = (TextView) view.findViewById(R.id.openapsma_profile);
+        mealDataView = (TextView) view.findViewById(R.id.openapsma_mealdata);
+        autosensDataView = (TextView) view.findViewById(R.id.openapsma_autosensdata);
+        scriptdebugView = (TextView) view.findViewById(R.id.openapsma_scriptdebugdata);
+        resultView = (TextView) view.findViewById(R.id.openapsma_result);
+        requestView = (TextView) view.findViewById(R.id.openapsma_request);
+
+        updateGUI();
+        return view;
+    }
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.openapsma_run:
+                OpenAPSSMBPlugin.getPlugin().invoke("OpenAPSSMB button");
+                Answers.getInstance().logCustom(new CustomEvent("OpenAPS_SMB_Run"));
+                break;
+        }
+
+    }
+
+    @Subscribe
+    public void onStatusEvent(final EventOpenAPSUpdateGui ev) {
+        updateGUI();
+    }
+
+    @Subscribe
+    public void onStatusEvent(final EventOpenAPSUpdateResultGui ev) {
+        updateResultGUI(ev.text);
+    }
+
+    @Override
+    protected void updateGUI() {
+        Activity activity = getActivity();
+        if (activity != null)
+            activity.runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    OpenAPSSMBPlugin plugin = OpenAPSSMBPlugin.getPlugin();
+                    DetermineBasalResultSMB lastAPSResult = plugin.lastAPSResult;
+                    if (lastAPSResult != null) {
+                        resultView.setText(JSONFormatter.format(lastAPSResult.json));
+                        requestView.setText(lastAPSResult.toSpanned());
+                    }
+                    DetermineBasalAdapterSMBJS determineBasalAdapterSMBJS = plugin.lastDetermineBasalAdapterSMBJS;
+                    if (determineBasalAdapterSMBJS != null) {
+                        glucoseStatusView.setText(JSONFormatter.format(determineBasalAdapterSMBJS.getGlucoseStatusParam()));
+                        currentTempView.setText(JSONFormatter.format(determineBasalAdapterSMBJS.getCurrentTempParam()));
+                        try {
+                            JSONArray iobArray = new JSONArray(determineBasalAdapterSMBJS.getIobDataParam());
+                            iobDataView.setText(String.format(MainApp.sResources.getString(R.string.array_of_elements), iobArray.length()) + "\n" + JSONFormatter.format(iobArray.getString(0)));
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                            iobDataView.setText("JSONException");
+                        }
+                        profileView.setText(JSONFormatter.format(determineBasalAdapterSMBJS.getProfileParam()));
+                        mealDataView.setText(JSONFormatter.format(determineBasalAdapterSMBJS.getMealDataParam()));
+                        scriptdebugView.setText(determineBasalAdapterSMBJS.getScriptDebug());
+                    }
+                    if (plugin.lastAPSRun != null) {
+                        lastRunView.setText(plugin.lastAPSRun.toLocaleString());
+                    }
+                    if (plugin.lastAutosensResult != null) {
+                        autosensDataView.setText(JSONFormatter.format(plugin.lastAutosensResult.json()));
+                    }
+                }
+            });
+    }
+
+    void updateResultGUI(final String text) {
+        Activity activity = getActivity();
+        if (activity != null)
+            activity.runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    resultView.setText(text);
+                    glucoseStatusView.setText("");
+                    currentTempView.setText("");
+                    iobDataView.setText("");
+                    profileView.setText("");
+                    mealDataView.setText("");
+                    autosensDataView.setText("");
+                    scriptdebugView.setText("");
+                    requestView.setText("");
+                    lastRunView.setText("");
+                }
+            });
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/OpenAPSSMBPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/OpenAPSSMBPlugin.java
new file mode 100644
index 0000000000..f056a9c607
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/OpenAPSSMBPlugin.java
@@ -0,0 +1,301 @@
+package info.nightscout.androidaps.plugins.OpenAPSSMB;
+
+import org.json.JSONException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.Date;
+
+import info.nightscout.androidaps.Config;
+import info.nightscout.androidaps.Constants;
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.data.GlucoseStatus;
+import info.nightscout.androidaps.data.IobTotal;
+import info.nightscout.androidaps.data.MealData;
+import info.nightscout.androidaps.data.Profile;
+import info.nightscout.androidaps.db.TempTarget;
+import info.nightscout.androidaps.interfaces.APSInterface;
+import info.nightscout.androidaps.interfaces.PluginBase;
+import info.nightscout.androidaps.interfaces.PumpInterface;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
+import info.nightscout.androidaps.plugins.IobCobCalculator.AutosensResult;
+import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin;
+import info.nightscout.androidaps.plugins.Loop.APSResult;
+import info.nightscout.androidaps.plugins.Loop.ScriptReader;
+import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateGui;
+import info.nightscout.androidaps.plugins.OpenAPSMA.events.EventOpenAPSUpdateResultGui;
+import info.nightscout.utils.DateUtil;
+import info.nightscout.utils.NSUpload;
+import info.nightscout.utils.Profiler;
+import info.nightscout.utils.Round;
+import info.nightscout.utils.SP;
+import info.nightscout.utils.ToastUtils;
+
+/**
+ * Created by mike on 05.08.2016.
+ */
+public class OpenAPSSMBPlugin implements PluginBase, APSInterface {
+    private static Logger log = LoggerFactory.getLogger(OpenAPSSMBPlugin.class);
+
+    // last values
+    DetermineBasalAdapterSMBJS lastDetermineBasalAdapterSMBJS = null;
+    Date lastAPSRun = null;
+    DetermineBasalResultSMB lastAPSResult = null;
+    AutosensResult lastAutosensResult = null;
+
+    boolean fragmentEnabled = false;
+    boolean fragmentVisible = true;
+
+    private static OpenAPSSMBPlugin openAPSSMBPlugin;
+
+    private OpenAPSSMBPlugin() {
+    }
+
+    public static OpenAPSSMBPlugin getPlugin() {
+        if (openAPSSMBPlugin == null) {
+            openAPSSMBPlugin = new OpenAPSSMBPlugin();
+        }
+        return openAPSSMBPlugin;
+    }
+
+    @Override
+    public String getName() {
+        return MainApp.instance().getString(R.string.openapssmb);
+    }
+
+    @Override
+    public String getNameShort() {
+        String name = MainApp.sResources.getString(R.string.smb_shortname);
+        if (!name.trim().isEmpty()) {
+            //only if translation exists
+            return name;
+        }
+        // use long name as fallback
+        return getName();
+    }
+
+    @Override
+    public boolean isEnabled(int type) {
+        boolean pumpCapable = ConfigBuilderPlugin.getActivePump() == null || ConfigBuilderPlugin.getActivePump().getPumpDescription().isTempBasalCapable;
+        return type == APS && fragmentEnabled && pumpCapable;
+    }
+
+    @Override
+    public boolean isVisibleInTabs(int type) {
+        boolean pumpCapable = ConfigBuilderPlugin.getActivePump() == null || ConfigBuilderPlugin.getActivePump().getPumpDescription().isTempBasalCapable;
+        return type == APS && fragmentVisible && pumpCapable;
+    }
+
+    @Override
+    public boolean canBeHidden(int type) {
+        return true;
+    }
+
+    @Override
+    public boolean hasFragment() {
+        return true;
+    }
+
+    @Override
+    public boolean showInList(int type) {
+        return true;
+    }
+
+    @Override
+    public void setFragmentVisible(int type, boolean fragmentVisible) {
+        if (type == APS) this.fragmentVisible = fragmentVisible;
+    }
+
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_openapssmb;
+    }
+
+    @Override
+    public void setFragmentEnabled(int type, boolean fragmentEnabled) {
+        if (type == APS) this.fragmentEnabled = fragmentEnabled;
+    }
+
+    @Override
+    public int getType() {
+        return PluginBase.APS;
+    }
+
+    @Override
+    public String getFragmentClass() {
+        return OpenAPSSMBFragment.class.getName();
+    }
+
+    @Override
+    public APSResult getLastAPSResult() {
+        return lastAPSResult;
+    }
+
+    @Override
+    public Date getLastAPSRun() {
+        return lastAPSRun;
+    }
+
+    @Override
+    public void invoke(String initiator) {
+        log.debug("invoke from " + initiator);
+        lastAPSResult = null;
+        DetermineBasalAdapterSMBJS determineBasalAdapterSMBJS = null;
+        try {
+            determineBasalAdapterSMBJS = new DetermineBasalAdapterSMBJS(new ScriptReader(MainApp.instance().getBaseContext()));
+        } catch (IOException e) {
+            log.error(e.getMessage(), e);
+            return;
+        }
+
+        GlucoseStatus glucoseStatus = GlucoseStatus.getGlucoseStatusData();
+        Profile profile = MainApp.getConfigBuilder().getProfile();
+        PumpInterface pump = ConfigBuilderPlugin.getActivePump();
+
+        if (profile == null) {
+            MainApp.bus().post(new EventOpenAPSUpdateResultGui(MainApp.instance().getString(R.string.noprofileselected)));
+            if (Config.logAPSResult)
+                log.debug(MainApp.instance().getString(R.string.noprofileselected));
+            return;
+        }
+
+        if (!isEnabled(PluginBase.APS)) {
+            MainApp.bus().post(new EventOpenAPSUpdateResultGui(MainApp.instance().getString(R.string.openapsma_disabled)));
+            if (Config.logAPSResult)
+                log.debug(MainApp.instance().getString(R.string.openapsma_disabled));
+            return;
+        }
+
+        if (glucoseStatus == null) {
+            MainApp.bus().post(new EventOpenAPSUpdateResultGui(MainApp.instance().getString(R.string.openapsma_noglucosedata)));
+            if (Config.logAPSResult)
+                log.debug(MainApp.instance().getString(R.string.openapsma_noglucosedata));
+            return;
+        }
+
+        String units = profile.getUnits();
+
+        double maxIob = SP.getDouble("openapsma_max_iob", 1.5d);
+        double maxBasal = SP.getDouble("openapsma_max_basal", 1d);
+        double minBg = Profile.toMgdl(profile.getTargetLow(), units);
+        double maxBg = Profile.toMgdl(profile.getTargetHigh(), units);
+        double targetBg = (minBg + maxBg) / 2;
+
+        minBg = Round.roundTo(minBg, 0.1d);
+        maxBg = Round.roundTo(maxBg, 0.1d);
+
+        Date start = new Date();
+        Date startPart = new Date();
+        IobTotal[] iobArray = IobCobCalculatorPlugin.calculateIobArrayForSMB();
+        Profiler.log(log, "calculateIobArrayInDia()", startPart);
+
+        startPart = new Date();
+        MealData mealData = MainApp.getConfigBuilder().getMealData();
+        Profiler.log(log, "getMealData()", startPart);
+
+        maxIob = MainApp.getConfigBuilder().applyMaxIOBConstraints(maxIob);
+
+        minBg = verifyHardLimits(minBg, "minBg", Constants.VERY_HARD_LIMIT_MIN_BG[0], Constants.VERY_HARD_LIMIT_MIN_BG[1]);
+        maxBg = verifyHardLimits(maxBg, "maxBg", Constants.VERY_HARD_LIMIT_MAX_BG[0], Constants.VERY_HARD_LIMIT_MAX_BG[1]);
+        targetBg = verifyHardLimits(targetBg, "targetBg", Constants.VERY_HARD_LIMIT_TARGET_BG[0], Constants.VERY_HARD_LIMIT_TARGET_BG[1]);
+
+        boolean isTempTarget = false;
+        TempTarget tempTarget = MainApp.getConfigBuilder().getTempTargetFromHistory(System.currentTimeMillis());
+        if (tempTarget != null) {
+            isTempTarget = true;
+            minBg = verifyHardLimits(tempTarget.low, "minBg", Constants.VERY_HARD_LIMIT_TEMP_MIN_BG[0], Constants.VERY_HARD_LIMIT_TEMP_MIN_BG[1]);
+            maxBg = verifyHardLimits(tempTarget.high, "maxBg", Constants.VERY_HARD_LIMIT_TEMP_MAX_BG[0], Constants.VERY_HARD_LIMIT_TEMP_MAX_BG[1]);
+            targetBg = verifyHardLimits((tempTarget.low + tempTarget.high) / 2, "targetBg", Constants.VERY_HARD_LIMIT_TEMP_TARGET_BG[0], Constants.VERY_HARD_LIMIT_TEMP_TARGET_BG[1]);
+        }
+
+
+        maxIob = verifyHardLimits(maxIob, "maxIob", 0, 7);
+        maxBasal = verifyHardLimits(maxBasal, "max_basal", 0.1, 10);
+
+        if (!checkOnlyHardLimits(profile.getDia(), "dia", 2, 7)) return;
+        if (!checkOnlyHardLimits(profile.getIc(profile.secondsFromMidnight()), "carbratio", 2, 100))
+            return;
+        if (!checkOnlyHardLimits(Profile.toMgdl(profile.getIsf().doubleValue(), units), "sens", 2, 900))
+            return;
+        if (!checkOnlyHardLimits(profile.getMaxDailyBasal(), "max_daily_basal", 0.1, 10)) return;
+        if (!checkOnlyHardLimits(pump.getBaseBasalRate(), "current_basal", 0.01, 5)) return;
+
+        startPart = new Date();
+        if (MainApp.getConfigBuilder().isAMAModeEnabled()) {
+            lastAutosensResult = IobCobCalculatorPlugin.detectSensitivityWithLock(IobCobCalculatorPlugin.oldestDataAvailable(), System.currentTimeMillis());
+        } else {
+            lastAutosensResult = new AutosensResult();
+        }
+        Profiler.log(log, "detectSensitivityandCarbAbsorption()", startPart);
+        Profiler.log(log, "SMB data gathering", start);
+
+        start = new Date();
+        try {
+            determineBasalAdapterSMBJS.setData(profile, maxIob, maxBasal, minBg, maxBg, targetBg, ConfigBuilderPlugin.getActivePump().getBaseBasalRate(), iobArray, glucoseStatus, mealData,
+                    lastAutosensResult.ratio, //autosensDataRatio
+                    isTempTarget,
+                    true //microBolusAllowed
+            );
+        } catch (JSONException e) {
+            log.error(e.getMessage());
+            return;
+        }
+
+
+        DetermineBasalResultSMB determineBasalResultSMB = determineBasalAdapterSMBJS.invoke();
+        Profiler.log(log, "SMB calculation", start);
+        // TODO still needed with oref1?
+        // Fix bug determine basal
+        if (determineBasalResultSMB.rate == 0d && determineBasalResultSMB.duration == 0 && !MainApp.getConfigBuilder().isTempBasalInProgress())
+            determineBasalResultSMB.tempBasalReqested = false;
+        // limit requests on openloop mode
+        if (!MainApp.getConfigBuilder().isClosedModeEnabled()) {
+            if (MainApp.getConfigBuilder().isTempBasalInProgress() && determineBasalResultSMB.rate == 0 && determineBasalResultSMB.duration == 0) {
+                // going to cancel
+            } else if (MainApp.getConfigBuilder().isTempBasalInProgress() && Math.abs(determineBasalResultSMB.rate - MainApp.getConfigBuilder().getTempBasalAbsoluteRateHistory()) < 0.1) {
+                determineBasalResultSMB.tempBasalReqested = false;
+            } else if (!MainApp.getConfigBuilder().isTempBasalInProgress() && Math.abs(determineBasalResultSMB.rate - pump.getBaseBasalRate()) < 0.1) {
+                determineBasalResultSMB.tempBasalReqested = false;
+            }
+        }
+
+        determineBasalResultSMB.iob = iobArray[0];
+        Date now = new Date();
+
+        try {
+            determineBasalResultSMB.json.put("timestamp", DateUtil.toISOString(now));
+        } catch (JSONException e) {
+            log.error("Unhandled exception", e);
+        }
+
+        lastDetermineBasalAdapterSMBJS = determineBasalAdapterSMBJS;
+        lastAPSResult = determineBasalResultSMB;
+        lastAPSRun = now;
+        MainApp.bus().post(new EventOpenAPSUpdateGui());
+
+        //deviceStatus.suggested = determineBasalResultAMA.json;
+    }
+
+    // safety checks
+    private static boolean checkOnlyHardLimits(Double value, String valueName, double lowLimit, double highLimit) {
+        return value.equals(verifyHardLimits(value, valueName, lowLimit, highLimit));
+    }
+
+    private static Double verifyHardLimits(Double value, String valueName, double lowLimit, double highLimit) {
+        Double newvalue = value;
+        if (newvalue < lowLimit || newvalue > highLimit) {
+            newvalue = Math.max(newvalue, lowLimit);
+            newvalue = Math.min(newvalue, highLimit);
+            String msg = String.format(MainApp.sResources.getString(R.string.openapsma_valueoutofrange), valueName);
+            msg += ".\n";
+            msg += String.format(MainApp.sResources.getString(R.string.openapsma_valuelimitedto), value, newvalue);
+            log.error(msg);
+            NSUpload.uploadError(msg);
+            ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), msg, R.raw.error);
+        }
+        return newvalue;
+    }
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/SMBDefaults.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/SMBDefaults.java
new file mode 100644
index 0000000000..a7e690ce79
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/SMBDefaults.java
@@ -0,0 +1,64 @@
+package info.nightscout.androidaps.plugins.OpenAPSSMB;
+
+/**
+ * Created by mike on 10.12.2017.
+ */
+
+public class SMBDefaults {
+    // CALCULATED OR FROM PREFS
+
+    // max_iob: 0 // if max_iob is not provided, will default to zero
+    // max_daily_safety_multiplier:3
+    // current_basal_safety_multiplier:4
+    // autosens_max:1.2
+    // autosens_min:0.7
+
+    // USED IN AUTOSENS
+    public final static boolean rewind_resets_autosens = true; // reset autosensitivity to neutral for awhile after each pump rewind
+
+    // USED IN TARGETS
+    // by default the higher end of the target range is used only for avoiding bolus wizard overcorrections
+    // use wide_bg_target_range: true to force neutral temps over a wider range of eventualBGs
+    public final static boolean wide_bg_target_range = false; // by default use only the low end of the pump's BG target range as OpenAPS target
+
+    // USED IN AUTOTUNE
+    public final static double autotune_isf_adjustmentFraction = 1.0; // keep autotune ISF closer to pump ISF via a weighted average of fullNewISF and pumpISF.  1.0 allows full adjustment, 0 is no adjustment from pump ISF.
+    public final static double remainingCarbsFraction = 1.0; // fraction of carbs we'll assume will absorb over 4h if we don't yet see carb absorption
+
+    // USED IN DETERMINE_BASAL
+    public final static boolean low_temptarget_lowers_sensitivity = false; // lower sensitivity for temptargets <= 99.
+    public final static boolean high_temptarget_raises_sensitivity = false; // raise sensitivity for temptargets >= 111.  synonym for exercise_mode
+    public final static boolean sensitivity_raises_target = true; // raise BG target when autosens detects sensitivity
+    public final static boolean resistance_lowers_target = false; // lower BG target when autosens detects resistance
+    public final static boolean adv_target_adjustments = false; // lower target automatically when BG and eventualBG are high
+    public final static boolean exercise_mode = false; // when true, > 105 mg/dL high temp target adjusts sensitivityRatio for exercise_mode. This majorly changes the behavior of high temp targets from before. synonmym for high_temptarget_raises_sensitivity
+    public final static int half_basal_exercise_target = 160; // when temptarget is 160 mg/dL *and* exercise_mode=true, run 50% basal at this level (120 = 75%; 140 = 60%)
+    // create maxCOB and default it to 120 because that's the most a typical body can absorb over 4 hours.
+    // (If someone enters more carbs or stacks more; OpenAPS will just truncate dosing based on 120.
+    // Essentially, this just limits AMA/SMB as a safety cap against excessive COB entry)
+    public final static int maxCOB = 120;
+    public final static boolean skip_neutral_temps = true; // ***** default false in oref1 ***** if true, don't set neutral temps
+    // unsuspend_if_no_temp:false // if true, pump will un-suspend after a zero temp finishes
+    // bolussnooze_dia_divisor:2 // bolus snooze decays after 1/2 of DIA
+    public final static int min_5m_carbimpact = 8; // mg/dL per 5m (8 mg/dL/5m corresponds to 24g/hr at a CSF of 4 mg/dL/g (x/5*60/4))
+    public final static int remainingCarbsCap = 90; // max carbs we'll assume will absorb over 4h if we don't yet see carb absorption
+    // WARNING: use SMB with caution: it can and will automatically bolus up to max_iob worth of extra insulin
+    // enableUAM:true // enable detection of unannounced meal carb absorption
+    public final static boolean A52_risk_enable = false;
+    //public final static boolean enableSMB_with_COB = true; // ***** default false in oref1 ***** enable supermicrobolus while COB is positive
+    //public final static boolean enableSMB_with_temptarget = true; // ***** default false in oref1 ***** enable supermicrobolus for eating soon temp targets
+    // *** WARNING *** DO NOT USE enableSMB_always or enableSMB_after_carbs with xDrip+, Libre, or similar
+    // xDrip+, LimiTTer, etc. do not properly filter out high-noise SGVs
+    // Using SMB overnight with such data sources risks causing a dangerous overdose of insulin
+    // if the CGM sensor reads falsely high and doesn't come down as actual BG does
+    // public final static boolean enableSMB_always = false; // always enable supermicrobolus (unless disabled by high temptarget)
+    // *** WARNING *** DO NOT USE enableSMB_always or enableSMB_after_carbs with xDrip+, Libre, or similar
+    //public final static boolean enableSMB_after_carbs = false; // enable supermicrobolus for 6h after carbs, even with 0 COB
+    //public final static boolean allowSMB_with_high_temptarget = false; // allow supermicrobolus (if otherwise enabled) even with high temp targets
+    public final static int maxSMBBasalMinutes = 30; // maximum minutes of basal that can be delivered as a single SMB with uncovered COB
+    // curve:"rapid-acting" // Supported curves: "bilinear", "rapid-acting" (Novolog, Novorapid, Humalog, Apidra) and "ultra-rapid" (Fiasp)
+    // useCustomPeakTime:false // allows changing insulinPeakTime
+    // insulinPeakTime:75 // number of minutes after a bolus activity peaks.  defaults to 55m for Fiasp if useCustomPeakTime: false
+    public final static int carbsReqThreshold = 1; // grams of carbsReq to trigger a pushover
+    // offline_hotspot:false // enabled an offline-only local wifi hotspot if no Internet available
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
index 775c97d810..69fbfdc149 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
@@ -159,19 +159,23 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
                                     detailedBolusInfo.carbs = finalCarbsAfterConstraints;
                                     detailedBolusInfo.context = context;
                                     detailedBolusInfo.source = Source.USER;
-                                    ConfigBuilderPlugin.getCommandQueue().bolus(detailedBolusInfo, new Callback() {
-                                        @Override
-                                        public void run() {
-                                            if (!result.success) {
-                                                Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
-                                                i.putExtra("soundid", R.raw.boluserror);
-                                                i.putExtra("status", result.comment);
-                                                i.putExtra("title", MainApp.sResources.getString(R.string.treatmentdeliveryerror));
-                                                i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                                MainApp.instance().startActivity(i);
+                                    if (detailedBolusInfo.insulin > 0 || ConfigBuilderPlugin.getActivePump().getPumpDescription().storesCarbInfo) {
+                                        ConfigBuilderPlugin.getCommandQueue().bolus(detailedBolusInfo, new Callback() {
+                                            @Override
+                                            public void run() {
+                                                if (!result.success) {
+                                                    Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
+                                                    i.putExtra("soundid", R.raw.boluserror);
+                                                    i.putExtra("status", result.comment);
+                                                    i.putExtra("title", MainApp.sResources.getString(R.string.treatmentdeliveryerror));
+                                                    i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                                                    MainApp.instance().startActivity(i);
+                                                }
                                             }
-                                        }
-                                    });
+                                        });
+                                    } else {
+                                        MainApp.getConfigBuilder().addToHistoryTreatment(detailedBolusInfo);
+                                    }
                                     Answers.getInstance().logCustom(new CustomEvent("Bolus"));
                                 }
                             }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
index fd720e9499..d74c9caadf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
@@ -365,19 +365,23 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
                                     detailedBolusInfo.carbTime = carbTime;
                                     detailedBolusInfo.boluscalc = boluscalcJSON;
                                     detailedBolusInfo.source = Source.USER;
-                                    ConfigBuilderPlugin.getCommandQueue().bolus(detailedBolusInfo, new Callback() {
-                                        @Override
-                                        public void run() {
-                                            if (!result.success) {
-                                                Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
-                                                i.putExtra("soundid", R.raw.boluserror);
-                                                i.putExtra("status", result.comment);
-                                                i.putExtra("title", MainApp.sResources.getString(R.string.treatmentdeliveryerror));
-                                                i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                                MainApp.instance().startActivity(i);
+                                    if (detailedBolusInfo.insulin > 0 || ConfigBuilderPlugin.getActivePump().getPumpDescription().storesCarbInfo) {
+                                        ConfigBuilderPlugin.getCommandQueue().bolus(detailedBolusInfo, new Callback() {
+                                            @Override
+                                            public void run() {
+                                                if (!result.success) {
+                                                    Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
+                                                    i.putExtra("soundid", R.raw.boluserror);
+                                                    i.putExtra("status", result.comment);
+                                                    i.putExtra("title", MainApp.sResources.getString(R.string.treatmentdeliveryerror));
+                                                    i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                                                    MainApp.instance().startActivity(i);
+                                                }
                                             }
-                                        }
-                                    });
+                                        });
+                                    } else {
+                                        MainApp.getConfigBuilder().addToHistoryTreatment(detailedBolusInfo);
+                                    }
                                     Answers.getInstance().logCustom(new CustomEvent("Wizard"));
                                 }
                             }
@@ -528,12 +532,12 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
         if (calculatedTotalInsulin > 0d || calculatedCarbs > 0d) {
             String insulinText = calculatedTotalInsulin > 0d ? (DecimalFormatter.to2Decimal(calculatedTotalInsulin) + "U") : "";
             String carbsText = calculatedCarbs > 0d ? (DecimalFormatter.to0Decimal(calculatedCarbs) + "g") : "";
-            total.setText(getString(R.string.result) + ": " + insulinText + " " + carbsText);
+            total.setText(MainApp.gs(R.string.result) + ": " + insulinText + " " + carbsText);
             okButton.setVisibility(View.VISIBLE);
         } else {
             // TODO this should also be run when loading the dialog as the OK button is initially visible
             //      but does nothing if neither carbs nor insulin is > 0
-            total.setText(getString(R.string.missing) + " " + DecimalFormatter.to0Decimal(wizard.carbsEquivalent) + "g");
+            total.setText(MainApp.gs(R.string.missing) + " " + DecimalFormatter.to0Decimal(wizard.carbsEquivalent) + "g");
             okButton.setVisibility(View.INVISIBLE);
         }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
index a8ad9c7074..13b81fe8be 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
@@ -93,8 +93,6 @@ import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
 import info.nightscout.androidaps.plugins.Loop.events.EventNewOpenLoopNotification;
 import info.nightscout.androidaps.plugins.NSClientInternal.broadcasts.BroadcastAckAlarm;
 import info.nightscout.androidaps.plugins.NSClientInternal.data.NSDeviceStatus;
-import info.nightscout.androidaps.plugins.OpenAPSAMA.DetermineBasalResultAMA;
-import info.nightscout.androidaps.plugins.OpenAPSAMA.OpenAPSAMAPlugin;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.CalibrationDialog;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.ErrorHelperActivity;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.NewTreatmentDialog;
@@ -148,12 +146,18 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
     TextView sage;
     TextView pbage;
 
-    CheckBox showPredictionView;
-    CheckBox showBasalsView;
-    CheckBox showIobView;
-    CheckBox showCobView;
-    CheckBox showDeviationsView;
-    CheckBox showRatiosView;
+    TextView showPredictionLabel;
+    CheckBox showPredictionCheckbox;
+    TextView showBasalsLabel;
+    CheckBox showBasalsCheckbox;
+    TextView showIobLabel;
+    CheckBox showIobCheckbox;
+    TextView showCobLabel;
+    CheckBox showCobCheckbox;
+    TextView showDeviationsLabel;
+    CheckBox showDeviationsCheckbox;
+    TextView showRatiosLabel;
+    CheckBox showRatiosCheckbox;
 
     RecyclerView notificationsView;
     LinearLayoutManager llm;
@@ -265,24 +269,37 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
 
             acceptTempLayout = (LinearLayout) view.findViewById(R.id.overview_accepttemplayout);
 
-            showPredictionView = (CheckBox) view.findViewById(R.id.overview_showprediction);
-            showBasalsView = (CheckBox) view.findViewById(R.id.overview_showbasals);
-            showIobView = (CheckBox) view.findViewById(R.id.overview_showiob);
-            showCobView = (CheckBox) view.findViewById(R.id.overview_showcob);
-            showDeviationsView = (CheckBox) view.findViewById(R.id.overview_showdeviations);
-            showRatiosView = (CheckBox) view.findViewById(R.id.overview_showratios);
-            showPredictionView.setChecked(SP.getBoolean("showprediction", false));
-            showBasalsView.setChecked(SP.getBoolean("showbasals", true));
-            showIobView.setChecked(SP.getBoolean("showiob", false));
-            showCobView.setChecked(SP.getBoolean("showcob", false));
-            showDeviationsView.setChecked(SP.getBoolean("showdeviations", false));
-            showRatiosView.setChecked(SP.getBoolean("showratios", false));
-            showPredictionView.setOnCheckedChangeListener(this);
-            showBasalsView.setOnCheckedChangeListener(this);
-            showIobView.setOnCheckedChangeListener(this);
-            showCobView.setOnCheckedChangeListener(this);
-            showDeviationsView.setOnCheckedChangeListener(this);
-            showRatiosView.setOnCheckedChangeListener(this);
+            showPredictionCheckbox = (CheckBox) view.findViewById(R.id.overview_showprediction);
+            showBasalsCheckbox = (CheckBox) view.findViewById(R.id.overview_showbasals);
+            showIobCheckbox = (CheckBox) view.findViewById(R.id.overview_showiob);
+            showCobCheckbox = (CheckBox) view.findViewById(R.id.overview_showcob);
+            showDeviationsCheckbox = (CheckBox) view.findViewById(R.id.overview_showdeviations);
+            showRatiosCheckbox = (CheckBox) view.findViewById(R.id.overview_showratios);
+            showPredictionCheckbox.setChecked(SP.getBoolean("showprediction", false));
+            showBasalsCheckbox.setChecked(SP.getBoolean("showbasals", true));
+            showIobCheckbox.setChecked(SP.getBoolean("showiob", false));
+            showCobCheckbox.setChecked(SP.getBoolean("showcob", false));
+            showDeviationsCheckbox.setChecked(SP.getBoolean("showdeviations", false));
+            showRatiosCheckbox.setChecked(SP.getBoolean("showratios", false));
+            showPredictionCheckbox.setOnCheckedChangeListener(this);
+            showBasalsCheckbox.setOnCheckedChangeListener(this);
+            showIobCheckbox.setOnCheckedChangeListener(this);
+            showCobCheckbox.setOnCheckedChangeListener(this);
+            showDeviationsCheckbox.setOnCheckedChangeListener(this);
+            showRatiosCheckbox.setOnCheckedChangeListener(this);
+
+            showPredictionLabel = (TextView) view.findViewById(R.id.overview_showprediction_label);
+            showPredictionLabel.setOnClickListener(this);
+            showBasalsLabel = (TextView) view.findViewById(R.id.overview_showbasals_label);
+            showBasalsLabel.setOnClickListener(this);
+            showIobLabel = (TextView) view.findViewById(R.id.overview_showiob_label);
+            showIobLabel.setOnClickListener(this);
+            showCobLabel = (TextView) view.findViewById(R.id.overview_showcob_label);
+            showCobLabel.setOnClickListener(this);
+            showDeviationsLabel = (TextView) view.findViewById(R.id.overview_showdeviations_label);
+            showDeviationsLabel.setOnClickListener(this);
+            showRatiosLabel = (TextView) view.findViewById(R.id.overview_showratios_label);
+            showRatiosLabel.setOnClickListener(this);
 
             notificationsView = (RecyclerView) view.findViewById(R.id.overview_notifications);
             notificationsView.setHasFixedSize(true);
@@ -375,24 +392,24 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             case R.id.overview_showiob:
                 break;
             case R.id.overview_showcob:
-                showDeviationsView.setOnCheckedChangeListener(null);
-                showDeviationsView.setChecked(false);
-                showDeviationsView.setOnCheckedChangeListener(this);
+                showDeviationsCheckbox.setOnCheckedChangeListener(null);
+                showDeviationsCheckbox.setChecked(false);
+                showDeviationsCheckbox.setOnCheckedChangeListener(this);
                 break;
             case R.id.overview_showdeviations:
-                showCobView.setOnCheckedChangeListener(null);
-                showCobView.setChecked(false);
-                showCobView.setOnCheckedChangeListener(this);
+                showCobCheckbox.setOnCheckedChangeListener(null);
+                showCobCheckbox.setChecked(false);
+                showCobCheckbox.setOnCheckedChangeListener(this);
                 break;
             case R.id.overview_showratios:
                 break;
         }
-        SP.putBoolean("showiob", showIobView.isChecked());
-        SP.putBoolean("showprediction", showPredictionView.isChecked());
-        SP.putBoolean("showbasals", showBasalsView.isChecked());
-        SP.putBoolean("showcob", showCobView.isChecked());
-        SP.putBoolean("showdeviations", showDeviationsView.isChecked());
-        SP.putBoolean("showratios", showRatiosView.isChecked());
+        SP.putBoolean("showiob", showIobCheckbox.isChecked());
+        SP.putBoolean("showprediction", showPredictionCheckbox.isChecked());
+        SP.putBoolean("showbasals", showBasalsCheckbox.isChecked());
+        SP.putBoolean("showcob", showCobCheckbox.isChecked());
+        SP.putBoolean("showdeviations", showDeviationsCheckbox.isChecked());
+        SP.putBoolean("showratios", showRatiosCheckbox.isChecked());
         scheduleUpdateGUI("onGraphCheckboxesCheckedChanged");
     }
 
@@ -619,6 +636,24 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 if (ConfigBuilderPlugin.getActivePump().isSuspended() || !ConfigBuilderPlugin.getActivePump().isInitialized())
                     ConfigBuilderPlugin.getCommandQueue().readStatus("RefreshClicked", null);
                 break;
+            case R.id.overview_showprediction_label:
+                showPredictionCheckbox.toggle();
+                break;
+            case R.id.overview_showbasals_label:
+                showBasalsCheckbox.toggle();
+                break;
+            case R.id.overview_showiob_label:
+                showIobCheckbox.toggle();
+                break;
+            case R.id.overview_showcob_label:
+                showCobCheckbox.toggle();
+                break;
+            case R.id.overview_showdeviations_label:
+                showDeviationsCheckbox.toggle();
+                break;
+            case R.id.overview_showratios_label:
+                showRatiosCheckbox.toggle();
+                break;
         }
 
     }
@@ -638,7 +673,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         if (ConfigBuilderPlugin.getActiveLoop() != null) {
             ConfigBuilderPlugin.getActiveLoop().invoke("Accept temp button", false);
             final LoopPlugin.LastRun finalLastRun = LoopPlugin.lastRun;
-            if (finalLastRun != null && finalLastRun.lastAPSRun != null && finalLastRun.constraintsProcessed.changeRequested) {
+            if (finalLastRun != null && finalLastRun.lastAPSRun != null && finalLastRun.constraintsProcessed.isChangeRequested()) {
                 AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
                 builder.setTitle(getContext().getString(R.string.confirmation));
                 builder.setMessage(getContext().getString(R.string.setbasalquestion) + "\n" + finalLastRun.constraintsProcessed);
@@ -1069,7 +1104,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             boolean showAcceptButton = !MainApp.getConfigBuilder().isClosedModeEnabled(); // Open mode needed
             showAcceptButton = showAcceptButton && finalLastRun != null && finalLastRun.lastAPSRun != null; // aps result must exist
             showAcceptButton = showAcceptButton && (finalLastRun.lastOpenModeAccept == null || finalLastRun.lastOpenModeAccept.getTime() < finalLastRun.lastAPSRun.getTime()); // never accepted or before last result
-            showAcceptButton = showAcceptButton && finalLastRun.constraintsProcessed.changeRequested; // change is requested
+            showAcceptButton = showAcceptButton && finalLastRun.constraintsProcessed.isChangeRequested(); // change is requested
 
             if (showAcceptButton && pump.isInitialized() && !pump.isSuspended() && ConfigBuilderPlugin.getActiveLoop() != null) {
                 acceptTempLayout.setVisibility(View.VISIBLE);
@@ -1247,13 +1282,13 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
             cobView.setText(cobText);
         }
 
-        final boolean showPrediction = showPredictionView.isChecked() && finalLastRun != null && finalLastRun.constraintsProcessed.getClass().equals(DetermineBasalResultAMA.class);
-        if (MainApp.getSpecificPlugin(OpenAPSAMAPlugin.class) != null && MainApp.getSpecificPlugin(OpenAPSAMAPlugin.class).isEnabled(PluginBase.APS)) {
-            showPredictionView.setVisibility(View.VISIBLE);
-            getActivity().findViewById(R.id.overview_showprediction_label).setVisibility(View.VISIBLE);
+        final boolean predictionsAvailable = finalLastRun != null && finalLastRun.request.hasPredictions;
+        if (predictionsAvailable) {
+            showPredictionCheckbox.setVisibility(View.VISIBLE);
+            showPredictionLabel.setVisibility(View.VISIBLE);
         } else {
-            showPredictionView.setVisibility(View.GONE);
-            getActivity().findViewById(R.id.overview_showprediction_label).setVisibility(View.GONE);
+            showPredictionCheckbox.setVisibility(View.GONE);
+            showPredictionLabel.setVisibility(View.GONE);
         }
 
         // pump status from ns
@@ -1306,8 +1341,8 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 final long toTime;
                 final long fromTime;
                 final long endTime;
-                if (showPrediction) {
-                    int predHours = (int) (Math.ceil(((DetermineBasalResultAMA) finalLastRun.constraintsProcessed).getLatestPredictionsTime() - System.currentTimeMillis()) / (60 * 60 * 1000));
+                if (predictionsAvailable && showPredictionCheckbox.isChecked()) {
+                    int predHours = (int) (Math.ceil(finalLastRun.constraintsProcessed.getLatestPredictionsTime() - System.currentTimeMillis()) / (60 * 60 * 1000));
                     predHours = Math.min(2, predHours);
                     predHours = Math.max(0, predHours);
                     hoursToFetch = rangeToDisplay - predHours;
@@ -1333,8 +1368,8 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 graphData.addInRangeArea(fromTime, endTime, lowLine, highLine);
 
                 // **** BG ****
-                if (showPrediction)
-                    graphData.addBgReadings(fromTime, toTime, lowLine, highLine, (DetermineBasalResultAMA) finalLastRun.constraintsProcessed);
+                if (predictionsAvailable && showPredictionCheckbox.isChecked())
+                    graphData.addBgReadings(fromTime, toTime, lowLine, highLine, finalLastRun.constraintsProcessed);
                 else
                     graphData.addBgReadings(fromTime, toTime, lowLine, highLine, null);
 
@@ -1345,7 +1380,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 graphData.addTreatments(fromTime, endTime);
 
                 // add basal data
-                if (pump.getPumpDescription().isTempBasalCapable && showBasalsView.isChecked()) {
+                if (pump.getPumpDescription().isTempBasalCapable && showBasalsCheckbox.isChecked()) {
                     graphData.addBasals(fromTime, now, lowLine / graphData.maxY / 1.2d);
                 }
 
@@ -1361,25 +1396,30 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 boolean useCobForScale = false;
                 boolean useDevForScale = false;
                 boolean useRatioForScale = false;
+                boolean useDSForScale = false;
 
-                if (showIobView.isChecked()) {
+                if (showIobCheckbox.isChecked()) {
                     useIobForScale = true;
-                } else if (showCobView.isChecked()) {
+                } else if (showCobCheckbox.isChecked()) {
                     useCobForScale = true;
-                } else if (showDeviationsView.isChecked()) {
+                } else if (showDeviationsCheckbox.isChecked()) {
                     useDevForScale = true;
-                } else if (showRatiosView.isChecked()) {
+                } else if (showRatiosCheckbox.isChecked()) {
                     useRatioForScale = true;
+                } else if (Config.displayDeviationSlope) {
+                    useDSForScale = true;
                 }
 
-                if (showIobView.isChecked())
+                if (showIobCheckbox.isChecked())
                     secondGraphData.addIob(fromTime, now, useIobForScale, 1d);
-                if (showCobView.isChecked())
+                if (showCobCheckbox.isChecked())
                     secondGraphData.addCob(fromTime, now, useCobForScale, useCobForScale ? 1d : 0.5d);
-                if (showDeviationsView.isChecked())
+                if (showDeviationsCheckbox.isChecked())
                     secondGraphData.addDeviations(fromTime, now, useDevForScale, 1d);
-                if (showRatiosView.isChecked())
+                if (showRatiosCheckbox.isChecked())
                     secondGraphData.addRatio(fromTime, now, useRatioForScale, 1d);
+                if (Config.displayDeviationSlope)
+                    secondGraphData.addDeviationSlope(fromTime, now, useDSForScale, 1d);
 
                 // **** NOW line ****
                 // set manual x bounds to have nice steps
@@ -1392,7 +1432,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                     activity.runOnUiThread(new Runnable() {
                         @Override
                         public void run() {
-                            if (showIobView.isChecked() || showCobView.isChecked() || showDeviationsView.isChecked() || showRatiosView.isChecked()) {
+                            if (showIobCheckbox.isChecked() || showCobCheckbox.isChecked() || showDeviationsCheckbox.isChecked() || showRatiosCheckbox.isChecked() || Config.displayDeviationSlope) {
                                 iobGraph.setVisibility(View.VISIBLE);
                             } else {
                                 iobGraph.setVisibility(View.GONE);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/graphData/GraphData.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/graphData/GraphData.java
index e76714c5b2..f6cd2eecdc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/graphData/GraphData.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/graphData/GraphData.java
@@ -12,7 +12,6 @@ import com.jjoe64.graphview.series.LineGraphSeries;
 import com.jjoe64.graphview.series.Series;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import info.nightscout.androidaps.Constants;
@@ -28,7 +27,7 @@ import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.IobCobCalculator.AutosensData;
 import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.plugins.IobCobCalculator.BasalData;
-import info.nightscout.androidaps.plugins.OpenAPSAMA.DetermineBasalResultAMA;
+import info.nightscout.androidaps.plugins.Loop.APSResult;
 import info.nightscout.androidaps.plugins.Overview.graphExtensions.AreaGraphSeries;
 import info.nightscout.androidaps.plugins.Overview.graphExtensions.DataPointWithLabelInterface;
 import info.nightscout.androidaps.plugins.Overview.graphExtensions.DoubleDataPoint;
@@ -56,7 +55,7 @@ public class GraphData {
         this.graph = graph;
     }
 
-    public void addBgReadings(long fromTime, long toTime, double lowLine, double highLine, DetermineBasalResultAMA amaResult) {
+    public void addBgReadings(long fromTime, long toTime, double lowLine, double highLine, APSResult apsResult) {
         double maxBgValue = 0d;
         bgReadingsArray = MainApp.getDbHelper().getBgreadingsDataFromTime(fromTime, true);
         List<DataPointWithLabelInterface> bgListArray = new ArrayList<>();
@@ -65,14 +64,12 @@ public class GraphData {
             return;
         }
 
-        Iterator<BgReading> it = bgReadingsArray.iterator();
-        while (it.hasNext()) {
-            BgReading bg = it.next();
+        for (BgReading bg : bgReadingsArray) {
             if (bg.value > maxBgValue) maxBgValue = bg.value;
             bgListArray.add(bg);
         }
-        if (amaResult != null) {
-            List<BgReading> predArray = amaResult.getPredictions();
+        if (apsResult != null) {
+            List<BgReading> predArray = apsResult.getPredictions();
             bgListArray.addAll(predArray);
         }
 
@@ -125,7 +122,7 @@ public class GraphData {
         List<ScaledDataPoint> basalLineArray = new ArrayList<>();
         List<ScaledDataPoint> absoluteBasalLineArray = new ArrayList<>();
         double lastLineBasal = 0;
-        double lastAbsoluteLineBasal = 0;
+        double lastAbsoluteLineBasal = -1;
         double lastBaseBasal = 0;
         double lastTempBasal = 0;
         for (long time = fromTime; time < toTime; time += 60 * 1000L) {
@@ -253,7 +250,7 @@ public class GraphData {
         }
 
         // Careportal
-        List<CareportalEvent> careportalEvents = MainApp.getDbHelper().getCareportalEventsFromTime(fromTime, true);
+        List<CareportalEvent> careportalEvents = MainApp.getDbHelper().getCareportalEventsFromTime(fromTime - 6 * 60 * 60 * 1000, true);
 
         for (int tx = 0; tx < careportalEvents.size(); tx++) {
             DataPointWithLabelInterface t = careportalEvents.get(tx);
@@ -267,7 +264,7 @@ public class GraphData {
         addSeries(new PointsWithLabelGraphSeries<>(treatmentsArray));
     }
 
-    double getNearestBg(long date) {
+    private double getNearestBg(long date) {
         double bg = 0;
         for (int r = bgReadingsArray.size() - 1; r >= 0; r--) {
             BgReading reading = bgReadingsArray.get(r);
@@ -401,21 +398,21 @@ public class GraphData {
 
     // scale in % of vertical size (like 0.3)
     public void addRatio(long fromTime, long toTime, boolean useForScale, double scale) {
-        LineGraphSeries<DataPoint> ratioSeries;
-        List<DataPoint> ratioArray = new ArrayList<>();
+        LineGraphSeries<ScaledDataPoint> ratioSeries;
+        List<ScaledDataPoint> ratioArray = new ArrayList<>();
         Double maxRatioValueFound = 0d;
         Scale ratioScale = new Scale(-1d);
 
         for (long time = fromTime; time <= toTime; time += 5 * 60 * 1000L) {
             AutosensData autosensData = IobCobCalculatorPlugin.getAutosensData(time);
             if (autosensData != null) {
-                ratioArray.add(new DataPoint(time, autosensData.autosensRatio));
+                ratioArray.add(new ScaledDataPoint(time, autosensData.autosensRatio, ratioScale));
                 maxRatioValueFound = Math.max(maxRatioValueFound, Math.abs(autosensData.autosensRatio));
             }
         }
 
         // RATIOS
-        DataPoint[] ratioData = new DataPoint[ratioArray.size()];
+        ScaledDataPoint[] ratioData = new ScaledDataPoint[ratioArray.size()];
         ratioData = ratioArray.toArray(ratioData);
         ratioSeries = new LineGraphSeries<>(ratioData);
         ratioSeries.setColor(MainApp.sResources.getColor(R.color.ratio));
@@ -429,6 +426,50 @@ public class GraphData {
         addSeries(ratioSeries);
     }
 
+    // scale in % of vertical size (like 0.3)
+    public void addDeviationSlope(long fromTime, long toTime, boolean useForScale, double scale) {
+        LineGraphSeries<ScaledDataPoint> dsMaxSeries;
+        LineGraphSeries<ScaledDataPoint> dsMinSeries;
+        List<ScaledDataPoint> dsMaxArray = new ArrayList<>();
+        List<ScaledDataPoint> dsMinArray = new ArrayList<>();
+        Double maxFromMaxValueFound = 0d;
+        Double maxFromMinValueFound = 0d;
+        Scale dsMaxScale = new Scale();
+        Scale dsMinScale = new Scale();
+
+        for (long time = fromTime; time <= toTime; time += 5 * 60 * 1000L) {
+            AutosensData autosensData = IobCobCalculatorPlugin.getAutosensData(time);
+            if (autosensData != null) {
+                dsMaxArray.add(new ScaledDataPoint(time, autosensData.slopeFromMaxDeviation, dsMaxScale));
+                dsMinArray.add(new ScaledDataPoint(time, autosensData.slopeFromMinDeviation, dsMinScale));
+                maxFromMaxValueFound = Math.max(maxFromMaxValueFound, Math.abs(autosensData.slopeFromMaxDeviation));
+                maxFromMinValueFound = Math.max(maxFromMinValueFound, Math.abs(autosensData.slopeFromMinDeviation));
+            }
+        }
+
+        // Slopes
+        ScaledDataPoint[] ratioMaxData = new ScaledDataPoint[dsMaxArray.size()];
+        ratioMaxData = dsMaxArray.toArray(ratioMaxData);
+        dsMaxSeries = new LineGraphSeries<>(ratioMaxData);
+        dsMaxSeries.setColor(Color.MAGENTA);
+        dsMaxSeries.setThickness(3);
+
+        ScaledDataPoint[] ratioMinData = new ScaledDataPoint[dsMinArray.size()];
+        ratioMinData = dsMinArray.toArray(ratioMinData);
+        dsMinSeries = new LineGraphSeries<>(ratioMinData);
+        dsMinSeries.setColor(Color.YELLOW);
+        dsMinSeries.setThickness(3);
+
+        if (useForScale)
+            maxY = Math.max(maxFromMaxValueFound, maxFromMinValueFound);
+
+        dsMaxScale.setMultiplier(maxY * scale / maxFromMaxValueFound);
+        dsMinScale.setMultiplier(maxY * scale / maxFromMinValueFound);
+
+        addSeries(dsMaxSeries);
+        addSeries(dsMinSeries);
+    }
+
     // scale in % of vertical size (like 0.3)
     public void addNowLine(long now) {
         LineGraphSeries<DataPoint> seriesNow;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/graphExtensions/DataPointWithLabelInterface.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/graphExtensions/DataPointWithLabelInterface.java
index 20d478692a..3f6280431c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/graphExtensions/DataPointWithLabelInterface.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/graphExtensions/DataPointWithLabelInterface.java
@@ -55,4 +55,5 @@ public interface DataPointWithLabelInterface extends DataPointInterface{
     PointsWithLabelGraphSeries.Shape getShape();
     float getSize();
     int getColor();
+    int getSecondColor();
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/graphExtensions/PointsWithLabelGraphSeries.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/graphExtensions/PointsWithLabelGraphSeries.java
index 7606a71f17..0051518bb4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/graphExtensions/PointsWithLabelGraphSeries.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/graphExtensions/PointsWithLabelGraphSeries.java
@@ -60,17 +60,12 @@ public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> e
      * You can also render a custom drawing via {@link com.jjoe64.graphview.series.PointsGraphSeries.CustomShape}
      */
     public enum Shape {
-        /**
-         * draws a point / circle
-         */
-        POINT,
-
-        /**
-         * draws a triangle
-         */
+        BG,
+        PREDICTION,
         TRIANGLE,
         RECTANGLE,
         BOLUS,
+        SMB,
         EXTENDEDBOLUS,
         PROFILE,
         MBG,
@@ -141,9 +136,6 @@ public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> e
         Iterator<E> values = getValues(minX, maxX);
 
         // draw background
-        double lastEndY = 0;
-        double lastEndX = 0;
-
         // draw data
 
         double diffY = maxY - minY;
@@ -154,9 +146,8 @@ public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> e
         float graphLeft = graphView.getGraphContentLeft();
         float graphTop = graphView.getGraphContentTop();
 
-        lastEndY = 0;
-        lastEndX = 0;
-        float firstX = 0;
+        float scaleX = (float) (graphWidth / diffX);
+
         int i=0;
         while (values.hasNext()) {
             E value = values.next();
@@ -171,9 +162,6 @@ public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> e
             double ratX = valX / diffX;
             double x = graphWidth * ratX;
 
-            double orgX = x;
-            double orgY = y;
-
             // overdraw
             boolean overdraw = false;
             if (x > graphWidth) { // end right
@@ -185,6 +173,14 @@ public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> e
             if (y > graphHeight) { // end top
                 overdraw = true;
             }
+
+            long duration = value.getDuration();
+            float endWithDuration = (float) (x + duration * scaleX + graphLeft + 1);
+            // cut off to graph start if needed
+            if (x < 0 && endWithDuration > 0) {
+                x = 0;
+            }
+
             /* Fix a bug that continue to show the DOT after Y axis */
             if(x < 0) {
                 overdraw = true;
@@ -195,15 +191,25 @@ public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> e
             registerDataPoint(endX, endY, value);
 
             float xpluslength = 0;
-            if (value.getDuration() > 0) {
-                xpluslength = endX + Math.min((float) (value.getDuration() * graphWidth / diffX), graphLeft + graphWidth);
+            if (duration > 0) {
+                xpluslength = Math.min(endWithDuration, graphLeft + graphWidth);
             }
 
             // draw data point
             if (!overdraw) {
-                if (value.getShape() == Shape.POINT) {
+                if (value.getShape() == Shape.BG) {
+                    mPaint.setStyle(Paint.Style.FILL);
                     mPaint.setStrokeWidth(0);
                     canvas.drawCircle(endX, endY, scaledPxSize, mPaint);
+                } else if (value.getShape() == Shape.PREDICTION) {
+                    mPaint.setColor(value.getColor());
+                    mPaint.setStyle(Paint.Style.FILL);
+                    mPaint.setStrokeWidth(0);
+                    canvas.drawCircle(endX, endY, scaledPxSize, mPaint);
+                    mPaint.setColor(value.getSecondColor());
+                    mPaint.setStyle(Paint.Style.FILL);
+                    mPaint.setStrokeWidth(0);
+                    canvas.drawCircle(endX, endY, scaledPxSize / 3, mPaint);
                 } else if (value.getShape() == Shape.RECTANGLE) {
                     canvas.drawRect(endX-scaledPxSize, endY-scaledPxSize, endX+scaledPxSize, endY+scaledPxSize, mPaint);
                 } else if (value.getShape() == Shape.TRIANGLE) {
@@ -224,6 +230,14 @@ public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> e
                     if (value.getLabel() != null) {
                         drawLabel45(endX, endY, value, canvas);
                     }
+                } else if (value.getShape() == Shape.SMB) {
+                    mPaint.setStrokeWidth(2);
+                    Point[] points = new Point[3];
+                    points[0] = new Point((int)endX, (int)(endY-value.getSize()));
+                    points[1] = new Point((int)(endX+value.getSize()), (int)(endY+value.getSize()*0.67));
+                    points[2] = new Point((int)(endX-value.getSize()), (int)(endY+value.getSize()*0.67));
+                    mPaint.setStyle(Paint.Style.FILL_AND_STROKE);
+                    drawArrows(points, canvas, mPaint);
                 } else if (value.getShape() == Shape.EXTENDEDBOLUS) {
                     mPaint.setStrokeWidth(0);
                     if (value.getLabel() != null) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Persistentnotification/PersistentNotificationPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Persistentnotification/PersistentNotificationPlugin.java
index 9e631def18..558d01b94d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Persistentnotification/PersistentNotificationPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Persistentnotification/PersistentNotificationPlugin.java
@@ -7,7 +7,7 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.support.v4.app.TaskStackBuilder;
-import android.support.v7.app.NotificationCompat;
+import android.support.v4.app.NotificationCompat;
 
 import com.squareup.otto.Subscribe;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/AbstractDanaRPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/AbstractDanaRPlugin.java
new file mode 100644
index 0000000000..ea47303fb6
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/AbstractDanaRPlugin.java
@@ -0,0 +1,557 @@
+package info.nightscout.androidaps.plugins.PumpDanaR;
+
+import android.support.annotation.Nullable;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.slf4j.Logger;
+
+import java.util.Date;
+import java.util.Objects;
+
+import info.nightscout.androidaps.BuildConfig;
+import info.nightscout.androidaps.Config;
+import info.nightscout.androidaps.Constants;
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.data.Profile;
+import info.nightscout.androidaps.data.ProfileStore;
+import info.nightscout.androidaps.data.PumpEnactResult;
+import info.nightscout.androidaps.db.ExtendedBolus;
+import info.nightscout.androidaps.db.TemporaryBasal;
+import info.nightscout.androidaps.interfaces.ConstraintsInterface;
+import info.nightscout.androidaps.interfaces.DanaRInterface;
+import info.nightscout.androidaps.interfaces.PluginBase;
+import info.nightscout.androidaps.interfaces.ProfileInterface;
+import info.nightscout.androidaps.interfaces.PumpDescription;
+import info.nightscout.androidaps.interfaces.PumpInterface;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
+import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
+import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
+import info.nightscout.androidaps.plugins.ProfileNS.NSProfilePlugin;
+import info.nightscout.androidaps.plugins.PumpDanaR.services.AbstractDanaRExecutionService;
+import info.nightscout.utils.DateUtil;
+import info.nightscout.utils.DecimalFormatter;
+import info.nightscout.utils.Round;
+
+/**
+ * Created by mike on 28.01.2018.
+ */
+
+public abstract class AbstractDanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, ConstraintsInterface, ProfileInterface {
+    protected Logger log;
+
+    protected boolean mPluginPumpEnabled = false;
+    protected boolean mPluginProfileEnabled = false;
+    protected boolean mFragmentPumpVisible = true;
+
+    protected AbstractDanaRExecutionService sExecutionService;
+
+    protected DanaRPump pump = DanaRPump.getInstance();
+    protected boolean useExtendedBoluses = false;
+
+    public PumpDescription pumpDescription = new PumpDescription();
+
+    @Override
+    public String getFragmentClass() {
+        return DanaRFragment.class.getName();
+    }
+
+    // Plugin base interface
+    @Override
+    public int getType() {
+        return PluginBase.PUMP;
+    }
+
+    @Override
+    public String getNameShort() {
+        String name = MainApp.sResources.getString(R.string.danarpump_shortname);
+        if (!name.trim().isEmpty()) {
+            //only if translation exists
+            return name;
+        }
+        // use long name as fallback
+        return getName();
+    }
+
+    @Override
+    public boolean isEnabled(int type) {
+        if (type == PluginBase.PROFILE) return mPluginProfileEnabled && mPluginPumpEnabled;
+        else if (type == PluginBase.PUMP) return mPluginPumpEnabled;
+        else if (type == PluginBase.CONSTRAINTS) return mPluginPumpEnabled;
+        return false;
+    }
+
+    @Override
+    public boolean isVisibleInTabs(int type) {
+        if (type == PluginBase.PROFILE || type == PluginBase.CONSTRAINTS) return false;
+        else if (type == PluginBase.PUMP) return mFragmentPumpVisible;
+        return false;
+    }
+
+    @Override
+    public boolean canBeHidden(int type) {
+        return true;
+    }
+
+    @Override
+    public boolean hasFragment() {
+        return true;
+    }
+
+    @Override
+    public boolean showInList(int type) {
+        return type == PUMP;
+    }
+
+    @Override
+    public void setFragmentEnabled(int type, boolean fragmentEnabled) {
+        if (type == PluginBase.PROFILE)
+            mPluginProfileEnabled = fragmentEnabled;
+        else if (type == PluginBase.PUMP)
+            mPluginPumpEnabled = fragmentEnabled;
+        // if pump profile was enabled need to switch to another too
+        if (type == PluginBase.PUMP && !fragmentEnabled && mPluginProfileEnabled) {
+            setFragmentEnabled(PluginBase.PROFILE, false);
+            setFragmentVisible(PluginBase.PROFILE, false);
+            NSProfilePlugin.getPlugin().setFragmentEnabled(PluginBase.PROFILE, true);
+            NSProfilePlugin.getPlugin().setFragmentVisible(PluginBase.PROFILE, true);
+        }
+    }
+
+    @Override
+    public void setFragmentVisible(int type, boolean fragmentVisible) {
+        if (type == PluginBase.PUMP)
+            mFragmentPumpVisible = fragmentVisible;
+    }
+
+    @Override
+    public boolean isSuspended() {
+        return pump.pumpSuspended;
+    }
+
+    @Override
+    public boolean isBusy() {
+        if (sExecutionService == null) return false;
+        return sExecutionService.isConnected() || sExecutionService.isConnecting();
+    }
+
+    // Pump interface
+    @Override
+    public PumpEnactResult setNewBasalProfile(Profile profile) {
+        PumpEnactResult result = new PumpEnactResult();
+
+        if (sExecutionService == null) {
+            log.error("setNewBasalProfile sExecutionService is null");
+            result.comment = "setNewBasalProfile sExecutionService is null";
+            return result;
+        }
+        if (!isInitialized()) {
+            log.error("setNewBasalProfile not initialized");
+            Notification notification = new Notification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, MainApp.sResources.getString(R.string.pumpNotInitializedProfileNotSet), Notification.URGENT);
+            MainApp.bus().post(new EventNewNotification(notification));
+            result.comment = MainApp.sResources.getString(R.string.pumpNotInitializedProfileNotSet);
+            return result;
+        } else {
+            MainApp.bus().post(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
+        }
+        if (!sExecutionService.updateBasalsInPump(profile)) {
+            Notification notification = new Notification(Notification.FAILED_UDPATE_PROFILE, MainApp.sResources.getString(R.string.failedupdatebasalprofile), Notification.URGENT);
+            MainApp.bus().post(new EventNewNotification(notification));
+            result.comment = MainApp.sResources.getString(R.string.failedupdatebasalprofile);
+            return result;
+        } else {
+            MainApp.bus().post(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
+            MainApp.bus().post(new EventDismissNotification(Notification.FAILED_UDPATE_PROFILE));
+            Notification notification = new Notification(Notification.PROFILE_SET_OK, MainApp.sResources.getString(R.string.profile_set_ok), Notification.INFO, 60);
+            MainApp.bus().post(new EventNewNotification(notification));
+            result.success = true;
+            result.enacted = true;
+            result.comment = "OK";
+            return result;
+        }
+    }
+
+    @Override
+    public boolean isThisProfileSet(Profile profile) {
+        if (!isInitialized())
+            return true; // TODO: not sure what's better. so far TRUE to prevent too many SMS
+        if (pump.pumpProfiles == null)
+            return true; // TODO: not sure what's better. so far TRUE to prevent too many SMS
+        int basalValues = pump.basal48Enable ? 48 : 24;
+        int basalIncrement = pump.basal48Enable ? 30 * 60 : 60 * 60;
+        for (int h = 0; h < basalValues; h++) {
+            Double pumpValue = pump.pumpProfiles[pump.activeProfile][h];
+            Double profileValue = profile.getBasal((Integer) (h * basalIncrement));
+            if (profileValue == null) return true;
+            if (Math.abs(pumpValue - profileValue) > getPumpDescription().basalStep) {
+                log.debug("Diff found. Hour: " + h + " Pump: " + pumpValue + " Profile: " + profileValue);
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public Date lastDataTime() {
+        return new Date(pump.lastConnection);
+    }
+
+    @Override
+    public double getBaseBasalRate() {
+        return pump.currentBasal;
+    }
+
+    @Override
+    public void stopBolusDelivering() {
+        if (sExecutionService == null) {
+            log.error("stopBolusDelivering sExecutionService is null");
+            return;
+        }
+        sExecutionService.bolusStop();
+    }
+
+    @Override
+    public PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes, boolean enforceNew) {
+        PumpEnactResult result = new PumpEnactResult();
+        ConfigBuilderPlugin configBuilderPlugin = MainApp.getConfigBuilder();
+        percent = configBuilderPlugin.applyBasalConstraints(percent);
+        if (percent < 0) {
+            result.isTempCancel = false;
+            result.enacted = false;
+            result.success = false;
+            result.comment = MainApp.instance().getString(R.string.danar_invalidinput);
+            log.error("setTempBasalPercent: Invalid input");
+            return result;
+        }
+        if (percent > getPumpDescription().maxTempPercent)
+            percent = getPumpDescription().maxTempPercent;
+        TemporaryBasal runningTB =  MainApp.getConfigBuilder().getRealTempBasalFromHistory(System.currentTimeMillis());
+        if (runningTB != null && runningTB.percentRate == percent && !enforceNew) {
+            result.enacted = false;
+            result.success = true;
+            result.isTempCancel = false;
+            result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
+            result.duration = pump.tempBasalRemainingMin;
+            result.percent = pump.tempBasalPercent;
+            result.absolute = MainApp.getConfigBuilder().getTempBasalAbsoluteRateHistory();
+            result.isPercent = true;
+            if (Config.logPumpActions)
+                log.debug("setTempBasalPercent: Correct value already set");
+            return result;
+        }
+        int durationInHours = Math.max(durationInMinutes / 60, 1);
+        boolean connectionOK = sExecutionService.tempBasal(percent, durationInHours);
+        if (connectionOK && pump.isTempBasalInProgress && pump.tempBasalPercent == percent) {
+            result.enacted = true;
+            result.success = true;
+            result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
+            result.isTempCancel = false;
+            result.duration = pump.tempBasalRemainingMin;
+            result.percent = pump.tempBasalPercent;
+            result.absolute = MainApp.getConfigBuilder().getTempBasalAbsoluteRateHistory();
+            result.isPercent = true;
+            if (Config.logPumpActions)
+                log.debug("setTempBasalPercent: OK");
+            return result;
+        }
+        result.enacted = false;
+        result.success = false;
+        result.comment = MainApp.instance().getString(R.string.tempbasaldeliveryerror);
+        log.error("setTempBasalPercent: Failed to set temp basal");
+        return result;
+    }
+
+    @Override
+    public PumpEnactResult setExtendedBolus(Double insulin, Integer durationInMinutes) {
+        ConfigBuilderPlugin configBuilderPlugin = MainApp.getConfigBuilder();
+        insulin = configBuilderPlugin.applyBolusConstraints(insulin);
+        // needs to be rounded
+        int durationInHalfHours = Math.max(durationInMinutes / 30, 1);
+        insulin = Round.roundTo(insulin, getPumpDescription().extendedBolusStep);
+
+        PumpEnactResult result = new PumpEnactResult();
+        ExtendedBolus runningEB = MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis());
+        if (runningEB != null && Math.abs(runningEB.insulin - insulin) < getPumpDescription().extendedBolusStep) {
+            result.enacted = false;
+            result.success = true;
+            result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
+            result.duration = pump.extendedBolusRemainingMinutes;
+            result.absolute = pump.extendedBolusAbsoluteRate;
+            result.isPercent = false;
+            result.isTempCancel = false;
+            if (Config.logPumpActions)
+                log.debug("setExtendedBolus: Correct extended bolus already set. Current: " + pump.extendedBolusAmount + " Asked: " + insulin);
+            return result;
+        }
+        boolean connectionOK = sExecutionService.extendedBolus(insulin, durationInHalfHours);
+        if (connectionOK && pump.isExtendedInProgress && Math.abs(pump.extendedBolusAmount - insulin) < getPumpDescription().extendedBolusStep) {
+            result.enacted = true;
+            result.success = true;
+            result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
+            result.isTempCancel = false;
+            result.duration = pump.extendedBolusRemainingMinutes;
+            result.absolute = pump.extendedBolusAbsoluteRate;
+            result.bolusDelivered = pump.extendedBolusAmount;
+            result.isPercent = false;
+            if (Config.logPumpActions)
+                log.debug("setExtendedBolus: OK");
+            return result;
+        }
+        result.enacted = false;
+        result.success = false;
+        result.comment = MainApp.instance().getString(R.string.danar_valuenotsetproperly);
+        log.error("setExtendedBolus: Failed to extended bolus");
+        return result;
+    }
+
+    @Override
+    public PumpEnactResult cancelExtendedBolus() {
+        PumpEnactResult result = new PumpEnactResult();
+        ExtendedBolus runningEB = MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis());
+        if (runningEB != null) {
+            sExecutionService.extendedBolusStop();
+            result.enacted = true;
+            result.isTempCancel = true;
+        }
+        if (!pump.isExtendedInProgress) {
+            result.success = true;
+            result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
+            if (Config.logPumpActions)
+                log.debug("cancelExtendedBolus: OK");
+            return result;
+        } else {
+            result.success = false;
+            result.comment = MainApp.instance().getString(R.string.danar_valuenotsetproperly);
+            log.error("cancelExtendedBolus: Failed to cancel extended bolus");
+            return result;
+        }
+    }
+
+    @Override
+    public void connect(String from) {
+        if (sExecutionService != null) {
+            sExecutionService.connect();
+            pumpDescription.basalStep = pump.basalStep;
+            pumpDescription.bolusStep = pump.bolusStep;
+        }
+    }
+
+    @Override
+    public boolean isConnected() {
+        return sExecutionService != null && sExecutionService.isConnected();
+    }
+
+    @Override
+    public boolean isConnecting() {
+        return sExecutionService != null && sExecutionService.isConnecting();
+    }
+
+    @Override
+    public void disconnect(String from) {
+        if (sExecutionService != null) sExecutionService.disconnect(from);
+    }
+
+    @Override
+    public void stopConnecting() {
+        if (sExecutionService != null) sExecutionService.stopConnecting();
+    }
+
+    @Override
+    public void getPumpStatus() {
+        if (sExecutionService != null) sExecutionService.getPumpStatus();
+    }
+
+    @Override
+    public JSONObject getJSONStatus() {
+        if (pump.lastConnection + 5 * 60 * 1000L < System.currentTimeMillis()) {
+            return null;
+        }
+        JSONObject pumpjson = new JSONObject();
+        JSONObject battery = new JSONObject();
+        JSONObject status = new JSONObject();
+        JSONObject extended = new JSONObject();
+        try {
+            battery.put("percent", pump.batteryRemaining);
+            status.put("status", pump.pumpSuspended ? "suspended" : "normal");
+            status.put("timestamp", DateUtil.toISOString(pump.lastConnection));
+            extended.put("Version", BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION);
+            extended.put("PumpIOB", pump.iob);
+            if (pump.lastBolusTime.getTime() != 0) {
+                extended.put("LastBolus", pump.lastBolusTime.toLocaleString());
+                extended.put("LastBolusAmount", pump.lastBolusAmount);
+            }
+            TemporaryBasal tb = MainApp.getConfigBuilder().getRealTempBasalFromHistory(System.currentTimeMillis());
+            if (tb != null) {
+                extended.put("TempBasalAbsoluteRate", tb.tempBasalConvertedToAbsolute(System.currentTimeMillis()));
+                extended.put("TempBasalStart", DateUtil.dateAndTimeString(tb.date));
+                extended.put("TempBasalRemaining", tb.getPlannedRemainingMinutes());
+            }
+            ExtendedBolus eb = MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis());
+            if (eb != null) {
+                extended.put("ExtendedBolusAbsoluteRate", eb.absoluteRate());
+                extended.put("ExtendedBolusStart", DateUtil.dateAndTimeString(eb.date));
+                extended.put("ExtendedBolusRemaining", eb.getPlannedRemainingMinutes());
+            }
+            extended.put("BaseBasalRate", getBaseBasalRate());
+            try {
+                extended.put("ActiveProfile", MainApp.getConfigBuilder().getProfileName());
+            } catch (Exception e) {
+            }
+
+            pumpjson.put("battery", battery);
+            pumpjson.put("status", status);
+            pumpjson.put("extended", extended);
+            pumpjson.put("reservoir", (int) pump.reservoirRemainingUnits);
+            pumpjson.put("clock", DateUtil.toISOString(new Date()));
+        } catch (JSONException e) {
+            log.error("Unhandled exception", e);
+        }
+        return pumpjson;
+    }
+
+    @Override
+    public String deviceID() {
+        return pump.serialNumber;
+    }
+
+    @Override
+    public PumpDescription getPumpDescription() {
+        return pumpDescription;
+    }
+
+    /**
+     * DanaR interface
+     */
+
+    @Override
+    public PumpEnactResult loadHistory(byte type) {
+        return sExecutionService.loadHistory(type);
+    }
+
+    /**
+     * Constraint interface
+     */
+
+    @Override
+    public boolean isLoopEnabled() {
+        return true;
+    }
+
+    @Override
+    public boolean isClosedModeEnabled() {
+        return true;
+    }
+
+    @Override
+    public boolean isAutosensModeEnabled() {
+        return true;
+    }
+
+    @Override
+    public boolean isAMAModeEnabled() {
+        return true;
+    }
+
+    @Override
+    public boolean isSMBModeEnabled() {
+        return true;
+    }
+
+    @SuppressWarnings("PointlessBooleanExpression")
+    @Override
+    public Double applyBasalConstraints(Double absoluteRate) {
+        double origAbsoluteRate = absoluteRate;
+        if (pump != null) {
+            if (absoluteRate > pump.maxBasal) {
+                absoluteRate = pump.maxBasal;
+                if (Config.logConstraintsChanges && origAbsoluteRate != Constants.basalAbsoluteOnlyForCheckLimit)
+                    log.debug("Limiting rate " + origAbsoluteRate + "U/h by pump constraint to " + absoluteRate + "U/h");
+            }
+        }
+        return absoluteRate;
+    }
+
+    @SuppressWarnings("PointlessBooleanExpression")
+    @Override
+    public Integer applyBasalConstraints(Integer percentRate) {
+        Integer origPercentRate = percentRate;
+        if (percentRate < 0) percentRate = 0;
+        if (percentRate > getPumpDescription().maxTempPercent)
+            percentRate = getPumpDescription().maxTempPercent;
+        if (!Objects.equals(percentRate, origPercentRate) && Config.logConstraintsChanges && !Objects.equals(origPercentRate, Constants.basalPercentOnlyForCheckLimit))
+            log.debug("Limiting percent rate " + origPercentRate + "% to " + percentRate + "%");
+        return percentRate;
+    }
+
+    @SuppressWarnings("PointlessBooleanExpression")
+    @Override
+    public Double applyBolusConstraints(Double insulin) {
+        double origInsulin = insulin;
+        if (pump != null) {
+            if (insulin > pump.maxBolus) {
+                insulin = pump.maxBolus;
+                if (Config.logConstraintsChanges && origInsulin != Constants.bolusOnlyForCheckLimit)
+                    log.debug("Limiting bolus " + origInsulin + "U by pump constraint to " + insulin + "U");
+            }
+        }
+        return insulin;
+    }
+
+    @Override
+    public Integer applyCarbsConstraints(Integer carbs) {
+        return carbs;
+    }
+
+    @Override
+    public Double applyMaxIOBConstraints(Double maxIob) {
+        return maxIob;
+    }
+
+    @Nullable
+    @Override
+    public ProfileStore getProfile() {
+        if (pump.lastSettingsRead == 0)
+            return null; // no info now
+        return pump.createConvertedProfile();
+    }
+
+    @Override
+    public String getUnits() {
+        return pump.getUnits();
+    }
+
+    @Override
+    public String getProfileName() {
+        return pump.createConvertedProfileName();
+    }
+
+    // Reply for sms communicator
+    public String shortStatus(boolean veryShort) {
+        String ret = "";
+        if (pump.lastConnection != 0) {
+            Long agoMsec = System.currentTimeMillis() - pump.lastConnection;
+            int agoMin = (int) (agoMsec / 60d / 1000d);
+            ret += "LastConn: " + agoMin + " minago\n";
+        }
+        if (pump.lastBolusTime.getTime() != 0) {
+            ret += "LastBolus: " + DecimalFormatter.to2Decimal(pump.lastBolusAmount) + "U @" + android.text.format.DateFormat.format("HH:mm", pump.lastBolusTime) + "\n";
+        }
+        if (MainApp.getConfigBuilder().isInHistoryRealTempBasalInProgress()) {
+            ret += "Temp: " + MainApp.getConfigBuilder().getRealTempBasalFromHistory(System.currentTimeMillis()).toStringFull() + "\n";
+        }
+        if (MainApp.getConfigBuilder().isInHistoryExtendedBoluslInProgress()) {
+            ret += "Extended: " + MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis()).toString() + "\n";
+        }
+        if (!veryShort) {
+            ret += "TDD: " + DecimalFormatter.to0Decimal(pump.dailyTotalUnits) + " / " + pump.maxDailyTotalUnits + " U\n";
+        }
+        ret += "IOB: " + pump.iob + "U\n";
+        ret += "Reserv: " + DecimalFormatter.to0Decimal(pump.reservoirRemainingUnits) + "U\n";
+        ret += "Batt: " + pump.batteryRemaining + "\n";
+        return ret;
+    }
+    // TODO: daily total constraint
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/BluetoothDevicePreference.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/BluetoothDevicePreference.java
index 63e14f0921..e39fdcfdaa 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/BluetoothDevicePreference.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/BluetoothDevicePreference.java
@@ -6,6 +6,7 @@ import android.preference.ListPreference;
 import android.util.AttributeSet;
 
 import java.util.Set;
+import java.util.Vector;
 
 public class BluetoothDevicePreference extends ListPreference {
 
@@ -13,25 +14,22 @@ public class BluetoothDevicePreference extends ListPreference {
         super(context, attrs);
 
         BluetoothAdapter bta = BluetoothAdapter.getDefaultAdapter();
-        Integer size = 0;
-        if (bta != null) {
-            size += bta.getBondedDevices().size();
-        }
-        CharSequence[] entries = new CharSequence[size];
-        int i = 0;
+        Vector<CharSequence> entries = new Vector<CharSequence>();
         if (bta != null) {
             Set<BluetoothDevice> pairedDevices = bta.getBondedDevices();
             for (BluetoothDevice dev : pairedDevices) {
-                entries[i] = dev.getName();
-                i++;
+                String name = dev.getName();
+                if(name != null) {
+                    entries.add(name);
+                }
             }
         }
-        setEntries(entries);
-        setEntryValues(entries);
+        setEntries(entries.toArray(new CharSequence[0]));
+        setEntryValues(entries.toArray(new CharSequence[0]));
     }
 
     public BluetoothDevicePreference(Context context) {
         this(context, null);
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRFragment.java
index 8ac6bb306b..1ca54a7eb6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRFragment.java
@@ -21,6 +21,12 @@ import com.squareup.otto.Subscribe;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Date;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import butterknife.Unbinder;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.events.EventExtendedBolusChange;
@@ -49,27 +55,24 @@ public class DanaRFragment extends SubscriberFragment {
         }
     };
 
-    TextView lastConnectionView;
-    TextView btConnectionView;
-    TextView lastBolusView;
-    TextView dailyUnitsView;
-    TextView basaBasalRateView;
-    TextView tempBasalView;
-    TextView extendedBolusView;
-    TextView batteryView;
-    TextView reservoirView;
-    TextView iobView;
-    TextView firmwareView;
-    TextView basalStepView;
-    TextView bolusStepView;
-    TextView serialNumberView;
-    TextView queueView;
-    Button viewProfileButton;
-    Button historyButton;
-    Button statsButton;
+    @BindView(R.id.danar_lastconnection) TextView lastConnectionView;
+    @BindView(R.id.danar_btconnection) TextView btConnectionView;
+    @BindView(R.id.danar_lastbolus) TextView lastBolusView;
+    @BindView(R.id.danar_dailyunits) TextView dailyUnitsView;
+    @BindView(R.id.danar_basabasalrate) TextView basaBasalRateView;
+    @BindView(R.id.danar_tempbasal) TextView tempBasalView;
+    @BindView(R.id.danar_extendedbolus) TextView extendedBolusView;
+    @BindView(R.id.danar_battery) TextView batteryView;
+    @BindView(R.id.danar_reservoir) TextView reservoirView;
+    @BindView(R.id.danar_iob) TextView iobView;
+    @BindView(R.id.danar_firmware) TextView firmwareView;
+    @BindView(R.id.danar_basalstep) TextView basalStepView;
+    @BindView(R.id.danar_bolusstep) TextView bolusStepView;
+    @BindView(R.id.danar_serialnumber) TextView serialNumberView;
+    @BindView(R.id.danar_queue) TextView queueView;
 
-    LinearLayout pumpStatusLayout;
-    TextView pumpStatusView;
+    @BindView(R.id.overview_pumpstatuslayout) LinearLayout pumpStatusLayout;
+    @BindView(R.id.overview_pumpstatus) TextView pumpStatusView;
 
     public DanaRFragment() {
     }
@@ -91,61 +94,10 @@ public class DanaRFragment extends SubscriberFragment {
                              Bundle savedInstanceState) {
         try {
             View view = inflater.inflate(R.layout.danar_fragment, container, false);
-            btConnectionView = (TextView) view.findViewById(R.id.danar_btconnection);
-            lastConnectionView = (TextView) view.findViewById(R.id.danar_lastconnection);
-            lastBolusView = (TextView) view.findViewById(R.id.danar_lastbolus);
-            dailyUnitsView = (TextView) view.findViewById(R.id.danar_dailyunits);
-            basaBasalRateView = (TextView) view.findViewById(R.id.danar_basabasalrate);
-            tempBasalView = (TextView) view.findViewById(R.id.danar_tempbasal);
-            extendedBolusView = (TextView) view.findViewById(R.id.danar_extendedbolus);
-            batteryView = (TextView) view.findViewById(R.id.danar_battery);
-            reservoirView = (TextView) view.findViewById(R.id.danar_reservoir);
-            iobView = (TextView) view.findViewById(R.id.danar_iob);
-            firmwareView = (TextView) view.findViewById(R.id.danar_firmware);
-            viewProfileButton = (Button) view.findViewById(R.id.danar_viewprofile);
-            historyButton = (Button) view.findViewById(R.id.danar_history);
-            statsButton = (Button) view.findViewById(R.id.danar_stats);
-            basalStepView = (TextView) view.findViewById(R.id.danar_basalstep);
-            bolusStepView = (TextView) view.findViewById(R.id.danar_bolusstep);
-            serialNumberView = (TextView) view.findViewById(R.id.danar_serialnumber);
-            queueView = (TextView) view.findViewById(R.id.danar_queue);
+            unbinder = ButterKnife.bind(this, view);
 
-            pumpStatusView = (TextView) view.findViewById(R.id.overview_pumpstatus);
             pumpStatusView.setBackgroundColor(MainApp.sResources.getColor(R.color.colorInitializingBorder));
-            pumpStatusLayout = (LinearLayout) view.findViewById(R.id.overview_pumpstatuslayout);
 
-            viewProfileButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    FragmentManager manager = getFragmentManager();
-                    ProfileViewDialog profileViewDialog = new ProfileViewDialog();
-                    profileViewDialog.show(manager, "ProfileViewDialog");
-                }
-            });
-
-            historyButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    startActivity(new Intent(getContext(), DanaRHistoryActivity.class));
-                }
-            });
-
-            statsButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    startActivity(new Intent(getContext(), DanaRStatsActivity.class));
-                }
-            });
-
-            btConnectionView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    log.debug("Clicked connect to pump");
-                    ConfigBuilderPlugin.getCommandQueue().readStatus("Clicked connect to pump", null);
-                }
-            });
-
-            updateGUI();
             return view;
         } catch (Exception e) {
             Crashlytics.logException(e);
@@ -154,6 +106,26 @@ public class DanaRFragment extends SubscriberFragment {
         return null;
     }
 
+    @OnClick(R.id.danar_history) void onHistoryClick() {
+        startActivity(new Intent(getContext(), DanaRHistoryActivity.class));
+    }
+
+    @OnClick(R.id.danar_viewprofile) void onViewProfileClick() {
+        FragmentManager manager = getFragmentManager();
+        ProfileViewDialog profileViewDialog = new ProfileViewDialog();
+        profileViewDialog.show(manager, "ProfileViewDialog");
+    }
+
+    @OnClick(R.id.danar_stats) void onStatsClick() {
+        startActivity(new Intent(getContext(), DanaRStatsActivity.class));
+    }
+
+    @OnClick(R.id.danar_btconnection) void onBtConnectionClick() {
+        log.debug("Clicked connect to pump");
+        DanaRPump.getInstance().lastConnection = 0;
+        ConfigBuilderPlugin.getCommandQueue().readStatus("Clicked connect to pump", null);
+    }
+
     @Subscribe
     public void onStatusEvent(final EventPumpStatusChanged c) {
         Activity activity = getActivity();
@@ -212,8 +184,8 @@ public class DanaRFragment extends SubscriberFragment {
                 @Override
                 public void run() {
                     DanaRPump pump = DanaRPump.getInstance();
-                    if (pump.lastConnection.getTime() != 0) {
-                        Long agoMsec = System.currentTimeMillis() - pump.lastConnection.getTime();
+                    if (pump.lastConnection != 0) {
+                        Long agoMsec = System.currentTimeMillis() - pump.lastConnection;
                         int agoMin = (int) (agoMsec / 60d / 1000d);
                         lastConnectionView.setText(DateUtil.timeString(pump.lastConnection) + " (" + String.format(MainApp.sResources.getString(R.string.minago), agoMin) + ")");
                         SetWarnColor.setColor(lastConnectionView, agoMin, 16d, 31d);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java
index 4ba660db66..9a0be55897 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java
@@ -5,69 +5,30 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
-import android.support.annotation.Nullable;
 
 import com.squareup.otto.Subscribe;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Date;
-import java.util.Objects;
-
-import info.nightscout.androidaps.BuildConfig;
 import info.nightscout.androidaps.Config;
-import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.events.EventPreferenceChange;
-import info.nightscout.androidaps.interfaces.ConstraintsInterface;
-import info.nightscout.androidaps.interfaces.DanaRInterface;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.ProfileInterface;
 import info.nightscout.androidaps.interfaces.PumpDescription;
-import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.data.ProfileStore;
-import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
-import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
-import info.nightscout.androidaps.plugins.ProfileNS.NSProfilePlugin;
 import info.nightscout.androidaps.plugins.PumpDanaR.services.DanaRExecutionService;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
 import info.nightscout.utils.Round;
 import info.nightscout.utils.SP;
 
 /**
  * Created by mike on 05.08.2016.
  */
-public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, ConstraintsInterface, ProfileInterface {
-    private static Logger log = LoggerFactory.getLogger(DanaRPlugin.class);
-
-    @Override
-    public String getFragmentClass() {
-        return DanaRFragment.class.getName();
-    }
-
-    private static boolean fragmentPumpEnabled = false;
-    private static boolean fragmentProfileEnabled = false;
-    private static boolean fragmentPumpVisible = true;
-
-    private static DanaRExecutionService sExecutionService;
-
-
-    private static DanaRPump pump = DanaRPump.getInstance();
-    private static boolean useExtendedBoluses = false;
+public class DanaRPlugin extends AbstractDanaRPlugin {
 
     private static DanaRPlugin plugin = null;
 
@@ -77,9 +38,8 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
         return plugin;
     }
 
-    public static PumpDescription pumpDescription = new PumpDescription();
-
     public DanaRPlugin() {
+        log = LoggerFactory.getLogger(DanaRPlugin.class);
         useExtendedBoluses = SP.getBoolean("danar_useextended", false);
 
         Context context = MainApp.instance().getApplicationContext();
@@ -110,6 +70,8 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
         pumpDescription.basalMinimumRate = 0.04d;
 
         pumpDescription.isRefillingCapable = true;
+
+        pumpDescription.storesCarbInfo = true;
     }
 
     private ServiceConnection mConnection = new ServiceConnection() {
@@ -145,83 +107,17 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
     }
 
     // Plugin base interface
-    @Override
-    public int getType() {
-        return PluginBase.PUMP;
-    }
-
     @Override
     public String getName() {
         return MainApp.instance().getString(R.string.danarpump);
     }
 
-    @Override
-    public String getNameShort() {
-        String name = MainApp.sResources.getString(R.string.danarpump_shortname);
-        if (!name.trim().isEmpty()) {
-            //only if translation exists
-            return name;
-        }
-        // use long name as fallback
-        return getName();
-    }
-
-    @Override
-    public boolean isEnabled(int type) {
-        if (type == PluginBase.PROFILE) return fragmentProfileEnabled && fragmentPumpEnabled;
-        else if (type == PluginBase.PUMP) return fragmentPumpEnabled;
-        else if (type == PluginBase.CONSTRAINTS) return fragmentPumpEnabled;
-        return false;
-    }
-
-    @Override
-    public boolean isVisibleInTabs(int type) {
-        if (type == PluginBase.PROFILE || type == PluginBase.CONSTRAINTS) return false;
-        else if (type == PluginBase.PUMP) return fragmentPumpVisible;
-        return false;
-    }
-
-    @Override
-    public boolean canBeHidden(int type) {
-        return true;
-    }
-
-    @Override
-    public boolean hasFragment() {
-        return true;
-    }
-
-    @Override
-    public boolean showInList(int type) {
-        return type == PUMP;
-    }
-
-    @Override
-    public void setFragmentEnabled(int type, boolean fragmentEnabled) {
-        if (type == PluginBase.PROFILE)
-            fragmentProfileEnabled = fragmentEnabled;
-        else if (type == PluginBase.PUMP)
-            fragmentPumpEnabled = fragmentEnabled;
-        // if pump profile was enabled need to switch to another too
-        if (type == PluginBase.PUMP && !fragmentEnabled && fragmentProfileEnabled) {
-            setFragmentEnabled(PluginBase.PROFILE, false);
-            setFragmentVisible(PluginBase.PROFILE, false);
-            NSProfilePlugin.getPlugin().setFragmentEnabled(PluginBase.PROFILE, true);
-            NSProfilePlugin.getPlugin().setFragmentVisible(PluginBase.PROFILE, true);
-        }
-    }
-
-    @Override
-    public void setFragmentVisible(int type, boolean fragmentVisible) {
-        if (type == PluginBase.PUMP)
-            fragmentPumpVisible = fragmentVisible;
-    }
-
     @Override
     public int getPreferencesId() {
         return R.xml.pref_danar;
     }
 
+    // Pump interface
     @Override
     public boolean isFakingTempsByExtendedBoluses() {
         return useExtendedBoluses;
@@ -229,82 +125,7 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
 
     @Override
     public boolean isInitialized() {
-        return pump.lastConnection.getTime() > 0 && pump.isExtendedBolusEnabled && pump.maxBasal > 0;
-    }
-
-    @Override
-    public boolean isSuspended() {
-        return pump.pumpSuspended;
-    }
-
-    @Override
-    public boolean isBusy() {
-        if (sExecutionService == null) return false;
-        return sExecutionService.isConnected() || sExecutionService.isConnecting();
-    }
-
-    // Pump interface
-    @Override
-    public PumpEnactResult setNewBasalProfile(Profile profile) {
-        PumpEnactResult result = new PumpEnactResult();
-
-        if (sExecutionService == null) {
-            log.error("setNewBasalProfile sExecutionService is null");
-            result.comment = "setNewBasalProfile sExecutionService is null";
-            return result;
-        }
-        if (!isInitialized()) {
-            log.error("setNewBasalProfile not initialized");
-            Notification notification = new Notification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, MainApp.sResources.getString(R.string.pumpNotInitializedProfileNotSet), Notification.URGENT);
-            MainApp.bus().post(new EventNewNotification(notification));
-            result.comment = MainApp.sResources.getString(R.string.pumpNotInitializedProfileNotSet);
-            return result;
-        } else {
-            MainApp.bus().post(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
-        }
-        if (!sExecutionService.updateBasalsInPump(profile)) {
-            Notification notification = new Notification(Notification.FAILED_UDPATE_PROFILE, MainApp.sResources.getString(R.string.failedupdatebasalprofile), Notification.URGENT);
-            MainApp.bus().post(new EventNewNotification(notification));
-            result.comment = MainApp.sResources.getString(R.string.failedupdatebasalprofile);
-            return result;
-        } else {
-            MainApp.bus().post(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
-            MainApp.bus().post(new EventDismissNotification(Notification.FAILED_UDPATE_PROFILE));
-            result.success = true;
-            result.enacted = true;
-            result.comment = "OK";
-            return result;
-        }
-    }
-
-    @Override
-    public boolean isThisProfileSet(Profile profile) {
-        if (!isInitialized())
-            return true; // TODO: not sure what's better. so far TRUE to prevent too many SMS
-        if (pump.pumpProfiles == null)
-            return true; // TODO: not sure what's better. so far TRUE to prevent too many SMS
-        int basalValues = pump.basal48Enable ? 48 : 24;
-        int basalIncrement = pump.basal48Enable ? 30 * 60 : 60 * 60;
-        for (int h = 0; h < basalValues; h++) {
-            Double pumpValue = pump.pumpProfiles[pump.activeProfile][h];
-            Double profileValue = profile.getBasal((Integer) (h * basalIncrement));
-            if (profileValue == null) return true;
-            if (Math.abs(pumpValue - profileValue) > getPumpDescription().basalStep) {
-                log.debug("Diff found. Hour: " + h + " Pump: " + pumpValue + " Profile: " + profileValue);
-                return false;
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public Date lastDataTime() {
-        return pump.lastConnection;
-    }
-
-    @Override
-    public double getBaseBasalRate() {
-        return pump.currentBasal;
+        return pump.lastConnection > 0 && pump.isExtendedBolusEnabled && pump.maxBasal > 0;
     }
 
     @Override
@@ -314,7 +135,7 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
         if (detailedBolusInfo.insulin > 0 || detailedBolusInfo.carbs > 0) {
             Treatment t = new Treatment();
             boolean connectionOK = false;
-            if (detailedBolusInfo.insulin > 0 || detailedBolusInfo.carbs > 0) connectionOK = sExecutionService.bolus(detailedBolusInfo.insulin, (int) detailedBolusInfo.carbs, t);
+            if (detailedBolusInfo.insulin > 0 || detailedBolusInfo.carbs > 0) connectionOK = sExecutionService.bolus(detailedBolusInfo.insulin, (int) detailedBolusInfo.carbs, detailedBolusInfo.carbTime, t);
             PumpEnactResult result = new PumpEnactResult();
             result.success = connectionOK;
             result.bolusDelivered = t.insulin;
@@ -337,15 +158,6 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
         }
     }
 
-    @Override
-    public void stopBolusDelivering() {
-        if (sExecutionService == null) {
-            log.error("stopBolusDelivering sExecutionService is null");
-            return;
-        }
-        sExecutionService.bolusStop();
-    }
-
     // This is called from APS
     @Override
     public PumpEnactResult setTempBasalAbsolute(Double absoluteRate, Integer durationInMinutes, boolean enforceNew) {
@@ -498,100 +310,6 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
         return result;
     }
 
-    @Override
-    public PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes, boolean enforceNew) {
-        PumpEnactResult result = new PumpEnactResult();
-        ConfigBuilderPlugin configBuilderPlugin = MainApp.getConfigBuilder();
-        percent = configBuilderPlugin.applyBasalConstraints(percent);
-        if (percent < 0) {
-            result.isTempCancel = false;
-            result.enacted = false;
-            result.success = false;
-            result.comment = MainApp.instance().getString(R.string.danar_invalidinput);
-            log.error("setTempBasalPercent: Invalid input");
-            return result;
-        }
-        if (percent > getPumpDescription().maxTempPercent)
-            percent = getPumpDescription().maxTempPercent;
-        TemporaryBasal runningTB =  MainApp.getConfigBuilder().getRealTempBasalFromHistory(System.currentTimeMillis());
-        if (runningTB != null && runningTB.percentRate == percent && !enforceNew) {
-            result.enacted = false;
-            result.success = true;
-            result.isTempCancel = false;
-            result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
-            result.duration = pump.tempBasalRemainingMin;
-            result.percent = pump.tempBasalPercent;
-            result.absolute = MainApp.getConfigBuilder().getTempBasalAbsoluteRateHistory();
-            result.isPercent = true;
-            if (Config.logPumpActions)
-                log.debug("setTempBasalPercent: Correct value already set");
-            return result;
-        }
-        int durationInHours = Math.max(durationInMinutes / 60, 1);
-        boolean connectionOK = sExecutionService.tempBasal(percent, durationInHours);
-        if (connectionOK && pump.isTempBasalInProgress && pump.tempBasalPercent == percent) {
-            result.enacted = true;
-            result.success = true;
-            result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
-            result.isTempCancel = false;
-            result.duration = pump.tempBasalRemainingMin;
-            result.percent = pump.tempBasalPercent;
-            result.absolute = MainApp.getConfigBuilder().getTempBasalAbsoluteRateHistory();
-            result.isPercent = true;
-            if (Config.logPumpActions)
-                log.debug("setTempBasalPercent: OK");
-            return result;
-        }
-        result.enacted = false;
-        result.success = false;
-        result.comment = MainApp.instance().getString(R.string.tempbasaldeliveryerror);
-        log.error("setTempBasalPercent: Failed to set temp basal");
-        return result;
-    }
-
-    @Override
-    public PumpEnactResult setExtendedBolus(Double insulin, Integer durationInMinutes) {
-        ConfigBuilderPlugin configBuilderPlugin = MainApp.getConfigBuilder();
-        insulin = configBuilderPlugin.applyBolusConstraints(insulin);
-        // needs to be rounded
-        int durationInHalfHours = Math.max(durationInMinutes / 30, 1);
-        insulin = Round.roundTo(insulin, getPumpDescription().extendedBolusStep);
-
-        PumpEnactResult result = new PumpEnactResult();
-        ExtendedBolus runningEB = MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis());
-        if (runningEB != null && Math.abs(runningEB.insulin - insulin) < getPumpDescription().extendedBolusStep) {
-            result.enacted = false;
-            result.success = true;
-            result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
-            result.duration = pump.extendedBolusRemainingMinutes;
-            result.absolute = pump.extendedBolusAbsoluteRate;
-            result.isPercent = false;
-            result.isTempCancel = false;
-            if (Config.logPumpActions)
-                log.debug("setExtendedBolus: Correct extended bolus already set. Current: " + pump.extendedBolusAmount + " Asked: " + insulin);
-            return result;
-        }
-        boolean connectionOK = sExecutionService.extendedBolus(insulin, durationInHalfHours);
-        if (connectionOK && pump.isExtendedInProgress && Math.abs(pump.extendedBolusAmount - insulin) < getPumpDescription().extendedBolusStep) {
-            result.enacted = true;
-            result.success = true;
-            result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
-            result.isTempCancel = false;
-            result.duration = pump.extendedBolusRemainingMinutes;
-            result.absolute = pump.extendedBolusAbsoluteRate;
-            result.bolusDelivered = pump.extendedBolusAmount;
-            result.isPercent = false;
-            if (Config.logPumpActions)
-                log.debug("setExtendedBolus: OK");
-            return result;
-        }
-        result.enacted = false;
-        result.success = false;
-        result.comment = MainApp.instance().getString(R.string.danar_valuenotsetproperly);
-        log.error("setExtendedBolus: Failed to extended bolus");
-        return result;
-    }
-
     @Override
     public PumpEnactResult cancelTempBasal(boolean force) {
         if (MainApp.getConfigBuilder().isInHistoryRealTempBasalInProgress())
@@ -632,257 +350,8 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
         }
     }
 
-    @Override
-    public PumpEnactResult cancelExtendedBolus() {
-        PumpEnactResult result = new PumpEnactResult();
-        ExtendedBolus runningEB = MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis());
-        if (runningEB != null) {
-            sExecutionService.extendedBolusStop();
-            result.enacted = true;
-            result.isTempCancel = true;
-        }
-        if (!pump.isExtendedInProgress) {
-            result.success = true;
-            result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
-            if (Config.logPumpActions)
-                log.debug("cancelExtendedBolus: OK");
-            return result;
-        } else {
-            result.success = false;
-            result.comment = MainApp.instance().getString(R.string.danar_valuenotsetproperly);
-            log.error("cancelExtendedBolus: Failed to cancel extended bolus");
-            return result;
-        }
-    }
-
-    @Override
-    public void connect(String from) {
-        if (sExecutionService != null) {
-            sExecutionService.connect(from);
-            pumpDescription.basalStep = pump.basalStep;
-            pumpDescription.bolusStep = pump.bolusStep;
-        }
-    }
-
-    @Override
-    public boolean isConnected() {
-        return sExecutionService != null && sExecutionService.isConnected();
-    }
-
-    @Override
-    public boolean isConnecting() {
-        return sExecutionService != null && sExecutionService.isConnecting();
-    }
-
-    @Override
-    public void disconnect(String from) {
-        if (sExecutionService != null) sExecutionService.disconnect(from);
-    }
-
-    @Override
-    public void stopConnecting() {
-        if (sExecutionService != null) sExecutionService.stopConnecting();
-    }
-
-    @Override
-    public void getPumpStatus() {
-        if (sExecutionService != null) sExecutionService.getPumpStatus();
-    }
-
-    @Override
-    public JSONObject getJSONStatus() {
-        if (pump.lastConnection.getTime() + 5 * 60 * 1000L < System.currentTimeMillis()) {
-            return null;
-        }
-        JSONObject pumpjson = new JSONObject();
-        JSONObject battery = new JSONObject();
-        JSONObject status = new JSONObject();
-        JSONObject extended = new JSONObject();
-        try {
-            battery.put("percent", pump.batteryRemaining);
-            status.put("status", pump.pumpSuspended ? "suspended" : "normal");
-            status.put("timestamp", DateUtil.toISOString(pump.lastConnection));
-            extended.put("Version", BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION);
-            extended.put("PumpIOB", pump.iob);
-            if (pump.lastBolusTime.getTime() != 0) {
-                extended.put("LastBolus", pump.lastBolusTime.toLocaleString());
-                extended.put("LastBolusAmount", pump.lastBolusAmount);
-            }
-            TemporaryBasal tb = MainApp.getConfigBuilder().getRealTempBasalFromHistory(System.currentTimeMillis());
-            if (tb != null) {
-                extended.put("TempBasalAbsoluteRate", tb.tempBasalConvertedToAbsolute(System.currentTimeMillis()));
-                extended.put("TempBasalStart", DateUtil.dateAndTimeString(tb.date));
-                extended.put("TempBasalRemaining", tb.getPlannedRemainingMinutes());
-            }
-            ExtendedBolus eb = MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis());
-            if (eb != null) {
-                extended.put("ExtendedBolusAbsoluteRate", eb.absoluteRate());
-                extended.put("ExtendedBolusStart", DateUtil.dateAndTimeString(eb.date));
-                extended.put("ExtendedBolusRemaining", eb.getPlannedRemainingMinutes());
-            }
-            extended.put("BaseBasalRate", getBaseBasalRate());
-            try {
-                extended.put("ActiveProfile", MainApp.getConfigBuilder().getProfileName());
-            } catch (Exception e) {
-            }
-
-            pumpjson.put("battery", battery);
-            pumpjson.put("status", status);
-            pumpjson.put("extended", extended);
-            pumpjson.put("reservoir", (int) pump.reservoirRemainingUnits);
-            pumpjson.put("clock", DateUtil.toISOString(new Date()));
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return pumpjson;
-    }
-
-    @Override
-    public String deviceID() {
-        return pump.serialNumber;
-    }
-
-    @Override
-    public PumpDescription getPumpDescription() {
-        return pumpDescription;
-    }
-
-    /**
-     * DanaR interface
-     */
-
-    @Override
-    public PumpEnactResult loadHistory(byte type) {
-        return sExecutionService.loadHistory(type);
-    }
-
     @Override
     public PumpEnactResult loadEvents() {
         return null; // no history, not needed
     }
-
-    /**
-     * Constraint interface
-     */
-
-    @Override
-    public boolean isLoopEnabled() {
-        return true;
-    }
-
-    @Override
-    public boolean isClosedModeEnabled() {
-        return true;
-    }
-
-    @Override
-    public boolean isAutosensModeEnabled() {
-        return true;
-    }
-
-    @Override
-    public boolean isAMAModeEnabled() {
-        return true;
-    }
-
-    @Override
-    public boolean isSMBModeEnabled() {
-        return true;
-    }
-
-    @SuppressWarnings("PointlessBooleanExpression")
-    @Override
-    public Double applyBasalConstraints(Double absoluteRate) {
-        double origAbsoluteRate = absoluteRate;
-        if (pump != null) {
-            if (absoluteRate > pump.maxBasal) {
-                absoluteRate = pump.maxBasal;
-                if (Config.logConstraintsChanges && origAbsoluteRate != Constants.basalAbsoluteOnlyForCheckLimit)
-                    log.debug("Limiting rate " + origAbsoluteRate + "U/h by pump constraint to " + absoluteRate + "U/h");
-            }
-        }
-        return absoluteRate;
-    }
-
-    @SuppressWarnings("PointlessBooleanExpression")
-    @Override
-    public Integer applyBasalConstraints(Integer percentRate) {
-        Integer origPercentRate = percentRate;
-        if (percentRate < 0) percentRate = 0;
-        if (percentRate > getPumpDescription().maxTempPercent)
-            percentRate = getPumpDescription().maxTempPercent;
-        if (!Objects.equals(percentRate, origPercentRate) && Config.logConstraintsChanges && !Objects.equals(origPercentRate, Constants.basalPercentOnlyForCheckLimit))
-            log.debug("Limiting percent rate " + origPercentRate + "% to " + percentRate + "%");
-        return percentRate;
-    }
-
-    @SuppressWarnings("PointlessBooleanExpression")
-    @Override
-    public Double applyBolusConstraints(Double insulin) {
-        double origInsulin = insulin;
-        if (pump != null) {
-            if (insulin > pump.maxBolus) {
-                insulin = pump.maxBolus;
-                if (Config.logConstraintsChanges && origInsulin != Constants.bolusOnlyForCheckLimit)
-                    log.debug("Limiting bolus " + origInsulin + "U by pump constraint to " + insulin + "U");
-            }
-        }
-        return insulin;
-    }
-
-    @Override
-    public Integer applyCarbsConstraints(Integer carbs) {
-        return carbs;
-    }
-
-    @Override
-    public Double applyMaxIOBConstraints(Double maxIob) {
-        return maxIob;
-    }
-
-    @Nullable
-    @Override
-    public ProfileStore getProfile() {
-        if (pump.lastSettingsRead.getTime() == 0)
-            return null; // no info now
-        return pump.createConvertedProfile();
-    }
-
-    @Override
-    public String getUnits() {
-        return pump.getUnits();
-    }
-
-    @Override
-    public String getProfileName() {
-        return pump.createConvertedProfileName();
-    }
-
-    // Reply for sms communicator
-    public String shortStatus(boolean veryShort) {
-        String ret = "";
-        if (pump.lastConnection.getTime() != 0) {
-            Long agoMsec = System.currentTimeMillis() - pump.lastConnection.getTime();
-            int agoMin = (int) (agoMsec / 60d / 1000d);
-            ret += "LastConn: " + agoMin + " minago\n";
-        }
-        if (pump.lastBolusTime.getTime() != 0) {
-            ret += "LastBolus: " + DecimalFormatter.to2Decimal(pump.lastBolusAmount) + "U @" + android.text.format.DateFormat.format("HH:mm", pump.lastBolusTime) + "\n";
-        }
-        if (MainApp.getConfigBuilder().isInHistoryRealTempBasalInProgress()) {
-            ret += "Temp: " + MainApp.getConfigBuilder().getRealTempBasalFromHistory(System.currentTimeMillis()).toStringFull() + "\n";
-        }
-        if (MainApp.getConfigBuilder().isInHistoryExtendedBoluslInProgress()) {
-            ret += "Extended: " + MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis()).toString() + "\n";
-        }
-        if (!veryShort) {
-            ret += "TDD: " + DecimalFormatter.to0Decimal(pump.dailyTotalUnits) + " / " + pump.maxDailyTotalUnits + " U\n";
-        }
-        ret += "IOB: " + pump.iob + "U\n";
-        ret += "Reserv: " + DecimalFormatter.to0Decimal(pump.reservoirRemainingUnits) + "U\n";
-        ret += "Batt: " + pump.batteryRemaining + "\n";
-        return ret;
-    }
-    // TODO: daily total constraint
-
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPump.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPump.java
index 9f88011c96..0e1a9ceb75 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPump.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPump.java
@@ -56,8 +56,8 @@ public class DanaRPump {
     public static final int CARBS = 14;
     public static final int PRIMECANNULA = 15;
 
-    public Date lastConnection = new Date(0);
-    public Date lastSettingsRead = new Date(0);
+    public long lastConnection = 0;
+    public long lastSettingsRead =0;
 
     // Info
     public String serialNumber = "";
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/SerialIOThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/SerialIOThread.java
index a333faecea..2f377a566a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/SerialIOThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/SerialIOThread.java
@@ -13,12 +13,13 @@ import java.io.OutputStream;
 import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageHashTable;
+import info.nightscout.androidaps.plugins.PumpDanaR.services.AbstractSerialIOThread;
 import info.nightscout.utils.CRC;
 
 /**
  * Created by mike on 17.07.2016.
  */
-public class SerialIOThread extends Thread {
+public class SerialIOThread extends AbstractSerialIOThread {
     private static Logger log = LoggerFactory.getLogger(SerialIOThread.class);
 
     private InputStream mInputStream = null;
@@ -28,10 +29,10 @@ public class SerialIOThread extends Thread {
     private boolean mKeepRunning = true;
     private byte[] mReadBuff = new byte[0];
 
-    MessageBase processedMessage;
+    private MessageBase processedMessage;
 
     public SerialIOThread(BluetoothSocket rfcommSocket) {
-        super(SerialIOThread.class.toString());
+        super();
 
         mRfCommSocket = rfcommSocket;
         try {
@@ -137,6 +138,7 @@ public class SerialIOThread extends Thread {
         }
     }
 
+    @Override
     public synchronized void sendMessage(MessageBase message) {
         if (!mRfCommSocket.isConnected()) {
             log.error("Socket not connected on sendMessage");
@@ -172,6 +174,7 @@ public class SerialIOThread extends Thread {
         }
     }
 
+    @Override
     public void disconnect(String reason) {
         mKeepRunning = false;
         try {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusTime.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusTime.java
index 17f90a1ba7..fe0d280113 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusTime.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgInitConnStatusTime.java
@@ -35,8 +35,8 @@ public class MsgInitConnStatusTime extends MessageBase {
             MainApp.getSpecificPlugin(DanaRKoreanPlugin.class).setFragmentVisible(PluginBase.PUMP, true);
             MainApp.getSpecificPlugin(DanaRPlugin.class).setFragmentEnabled(PluginBase.PUMP, false);
             MainApp.getSpecificPlugin(DanaRPlugin.class).setFragmentVisible(PluginBase.PUMP, false);
-            DanaRPump.getInstance().lastConnection = new Date(0); // mark not initialized
 
+            DanaRPump.getInstance().lastConnection = 0; // mark not initialized
             //If profile coming from pump, switch it as well
             if(MainApp.getSpecificPlugin(DanaRPlugin.class).isEnabled(PluginBase.PROFILE)){
                 (MainApp.getSpecificPlugin(DanaRPlugin.class)).setFragmentEnabled(PluginBase.PROFILE, false);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingBasal.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingBasal.java
index e1a7e45315..a47803c1b0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingBasal.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingBasal.java
@@ -23,7 +23,7 @@ public class MsgSettingBasal extends MessageBase {
         pump.pumpProfiles[pump.activeProfile] = new double[24];
         for (int index = 0; index < 24; index++) {
             int basal = intFromBuff(bytes, 2 * index, 2);
-            if (basal < DanaRPlugin.pumpDescription.basalMinimumRate) basal = 0;
+            if (basal < DanaRPlugin.getPlugin().pumpDescription.basalMinimumRate) basal = 0;
             pump.pumpProfiles[pump.activeProfile][index] = basal / 100d;
         }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingMeal.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingMeal.java
index 2d54d4f4a2..5d7b4b65ac 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingMeal.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingMeal.java
@@ -6,10 +6,12 @@ import org.slf4j.LoggerFactory;
 import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
+import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin;
 
 /**
  * Created by mike on 13.12.2016.
@@ -40,6 +42,11 @@ public class MsgSettingMeal extends MessageBase {
             log.debug("Is Config U/d: " + pump.isConfigUD);
         }
 
+        // DanaRKorean is not possible to set to 0.01 but it works when controlled from AAPS
+        if (DanaRKoreanPlugin.getPlugin().isEnabled(PluginBase.PUMP)) {
+            pump.basalStep = 0.01d;
+        }
+
         if (pump.basalStep != 0.01d) {
             Notification notification = new Notification(Notification.WRONGBASALSTEP, MainApp.sResources.getString(R.string.danar_setbasalstep001), Notification.URGENT);
             MainApp.bus().post(new EventNewNotification(notification));
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/AbstractDanaRExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/AbstractDanaRExecutionService.java
new file mode 100644
index 0000000000..d853c9abf1
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/AbstractDanaRExecutionService.java
@@ -0,0 +1,225 @@
+package info.nightscout.androidaps.plugins.PumpDanaR.services;
+
+import android.app.Service;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothSocket;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.IBinder;
+import android.os.SystemClock;
+
+import org.slf4j.Logger;
+
+import java.io.IOException;
+import java.util.Set;
+import java.util.UUID;
+
+import info.nightscout.androidaps.Config;
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.data.Profile;
+import info.nightscout.androidaps.data.PumpEnactResult;
+import info.nightscout.androidaps.db.Treatment;
+import info.nightscout.androidaps.events.EventPumpStatusChanged;
+import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.PumpDanaR.SerialIOThread;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusStop;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryAlarm;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryBasalHour;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryBolus;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryCarbo;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryDailyInsulin;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryDone;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryError;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryGlucose;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryRefill;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistorySuspend;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgPCCommStart;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgPCCommStop;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.RecordTypes;
+import info.nightscout.utils.SP;
+import info.nightscout.utils.ToastUtils;
+
+/**
+ * Created by mike on 28.01.2018.
+ */
+
+public abstract class AbstractDanaRExecutionService extends Service {
+    protected Logger log;
+
+    protected String mDevName;
+
+    protected BluetoothSocket mRfcommSocket;
+    protected BluetoothDevice mBTDevice;
+
+    protected DanaRPump mDanaRPump = DanaRPump.getInstance();
+    protected Treatment mBolusingTreatment = null;
+
+    protected Boolean mConnectionInProgress = false;
+
+    protected AbstractSerialIOThread mSerialIOThread;
+
+    protected IBinder mBinder;
+
+    protected final UUID SPP_UUID = UUID.fromString("00001101-0000-1000-8000-00805f9b34fb");
+
+    public abstract boolean updateBasalsInPump(final Profile profile);
+
+    public abstract void connect();
+
+    public abstract void getPumpStatus();
+
+    public abstract PumpEnactResult loadEvents();
+
+    public abstract boolean bolus(double amount, int carbs, long carbtime, final Treatment t);
+
+    public abstract boolean highTempBasal(int percent); // Rv2 only
+
+    public abstract boolean tempBasal(int percent, int durationInHours);
+
+    public abstract boolean tempBasalStop();
+
+    public abstract boolean extendedBolus(double insulin, int durationInHalfHours);
+
+    public abstract boolean extendedBolusStop();
+
+
+    protected BroadcastReceiver receiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+            String action = intent.getAction();
+            if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)) {
+                log.debug("Device was disconnected " + device.getName());//Device was disconnected
+                if (mBTDevice != null && mBTDevice.getName() != null && mBTDevice.getName().equals(device.getName())) {
+                    if (mSerialIOThread != null) {
+                        mSerialIOThread.disconnect("BT disconnection broadcast");
+                    }
+                    MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.DISCONNECTED));
+                }
+            }
+        }
+    };
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mBinder;
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        return START_STICKY;
+    }
+
+    public boolean isConnected() {
+        return mRfcommSocket != null && mRfcommSocket.isConnected();
+    }
+
+    public boolean isConnecting() {
+        return mConnectionInProgress;
+    }
+
+    public void disconnect(String from) {
+        if (mSerialIOThread != null)
+            mSerialIOThread.disconnect(from);
+    }
+
+    public void stopConnecting() {
+        if (mSerialIOThread != null)
+            mSerialIOThread.disconnect("stopConnecting");
+    }
+
+    protected void getBTSocketForSelectedPump() {
+        mDevName = SP.getString(MainApp.sResources.getString(R.string.key_danar_bt_name), "");
+        BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+
+        if (bluetoothAdapter != null) {
+            Set<BluetoothDevice> bondedDevices = bluetoothAdapter.getBondedDevices();
+
+            for (BluetoothDevice device : bondedDevices) {
+                if (mDevName.equals(device.getName())) {
+                    mBTDevice = device;
+                    try {
+                        mRfcommSocket = mBTDevice.createRfcommSocketToServiceRecord(SPP_UUID);
+                    } catch (IOException e) {
+                        log.error("Error creating socket: ", e);
+                    }
+                    break;
+                }
+            }
+        } else {
+            ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.nobtadapter));
+        }
+        if (mBTDevice == null) {
+            ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.devicenotfound));
+        }
+    }
+
+    public void bolusStop() {
+        if (Config.logDanaBTComm)
+            log.debug("bolusStop >>>>> @ " + (mBolusingTreatment == null ? "" : mBolusingTreatment.insulin));
+        MsgBolusStop stop = new MsgBolusStop();
+        stop.forced = true;
+        if (isConnected()) {
+            mSerialIOThread.sendMessage(stop);
+            while (!stop.stopped) {
+                mSerialIOThread.sendMessage(stop);
+                SystemClock.sleep(200);
+            }
+        } else {
+            stop.stopped = true;
+        }
+    }
+
+    public PumpEnactResult loadHistory(byte type) {
+        PumpEnactResult result = new PumpEnactResult();
+        if (!isConnected()) return result;
+        MessageBase msg = null;
+        switch (type) {
+            case RecordTypes.RECORD_TYPE_ALARM:
+                msg = new MsgHistoryAlarm();
+                break;
+            case RecordTypes.RECORD_TYPE_BASALHOUR:
+                msg = new MsgHistoryBasalHour();
+                break;
+            case RecordTypes.RECORD_TYPE_BOLUS:
+                msg = new MsgHistoryBolus();
+                break;
+            case RecordTypes.RECORD_TYPE_CARBO:
+                msg = new MsgHistoryCarbo();
+                break;
+            case RecordTypes.RECORD_TYPE_DAILY:
+                msg = new MsgHistoryDailyInsulin();
+                break;
+            case RecordTypes.RECORD_TYPE_ERROR:
+                msg = new MsgHistoryError();
+                break;
+            case RecordTypes.RECORD_TYPE_GLUCOSE:
+                msg = new MsgHistoryGlucose();
+                break;
+            case RecordTypes.RECORD_TYPE_REFILL:
+                msg = new MsgHistoryRefill();
+                break;
+            case RecordTypes.RECORD_TYPE_SUSPEND:
+                msg = new MsgHistorySuspend();
+                break;
+        }
+        MsgHistoryDone done = new MsgHistoryDone();
+        mSerialIOThread.sendMessage(new MsgPCCommStart());
+        SystemClock.sleep(400);
+        mSerialIOThread.sendMessage(msg);
+        while (!done.received && mRfcommSocket.isConnected()) {
+            SystemClock.sleep(100);
+        }
+        SystemClock.sleep(200);
+        mSerialIOThread.sendMessage(new MsgPCCommStop());
+        result.success = true;
+        result.comment = "OK";
+        return result;
+    }
+
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/AbstractSerialIOThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/AbstractSerialIOThread.java
new file mode 100644
index 0000000000..1cca0b2512
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/AbstractSerialIOThread.java
@@ -0,0 +1,13 @@
+package info.nightscout.androidaps.plugins.PumpDanaR.services;
+
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
+
+/**
+ * Created by mike on 28.01.2018.
+ */
+
+public abstract class AbstractSerialIOThread extends Thread {
+
+    public abstract void sendMessage(MessageBase message);
+    public abstract void disconnect(String reason);
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/DanaRExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/DanaRExecutionService.java
index 0aa4b176c7..63215464a8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/DanaRExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/services/DanaRExecutionService.java
@@ -1,41 +1,33 @@
 package info.nightscout.androidaps.plugins.PumpDanaR.services;
 
-import android.app.Service;
-import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothSocket;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Binder;
-import android.os.IBinder;
 import android.os.SystemClock;
 
 import com.squareup.otto.Subscribe;
 
-import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.Date;
-import java.util.Set;
-import java.util.UUID;
 
 import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.events.EventInitializationChanged;
 import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
-import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.BolusProgressDialog;
+import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventOverviewBolusProgress;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPlugin;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
 import info.nightscout.androidaps.plugins.PumpDanaR.SerialIOThread;
@@ -45,18 +37,6 @@ import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusStart;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusStartWithSpeed;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusStop;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgCheckValue;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryAlarm;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryBasalHour;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryBolus;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryCarbo;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryDailyInsulin;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryDone;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryError;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryGlucose;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryRefill;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistorySuspend;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgPCCommStart;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgPCCommStop;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetActivateBasalProfile;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetBasalProfile;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetCarbsEntry;
@@ -67,9 +47,9 @@ import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetTempBasalStop;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetTime;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingActiveProfile;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingBasal;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingMeal;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingGlucose;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingMaxValues;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingMeal;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingProfileRatios;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingProfileRatiosAll;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingPumpTime;
@@ -78,51 +58,18 @@ import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatus;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatusBasic;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatusBolusExtended;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatusTempBasal;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.RecordTypes;
 import info.nightscout.androidaps.plugins.PumpDanaR.events.EventDanaRNewStatus;
-import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.utils.NSUpload;
 import info.nightscout.utils.SP;
 import info.nightscout.utils.ToastUtils;
 
-public class DanaRExecutionService extends Service {
-    private static Logger log = LoggerFactory.getLogger(DanaRExecutionService.class);
-
-    private String devName;
-
-    private SerialIOThread mSerialIOThread;
-    private BluetoothSocket mRfcommSocket;
-    private BluetoothDevice mBTDevice;
-
-    private IBinder mBinder = new LocalBinder();
-
-    private DanaRPump danaRPump = DanaRPump.getInstance();
-    private Treatment bolusingTreatment = null;
-
-    private static Boolean connectionInProgress = false;
-
-    private static final UUID SPP_UUID = UUID.fromString("00001101-0000-1000-8000-00805f9b34fb");
-
-    private BroadcastReceiver receiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-            String action = intent.getAction();
-            if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)) {
-                log.debug("Device was disconnected " + device.getName());//Device was disconnected
-                if (mBTDevice != null && mBTDevice.getName() != null && mBTDevice.getName().equals(device.getName())) {
-                    if (mSerialIOThread != null) {
-                        mSerialIOThread.disconnect("BT disconnection broadcast");
-                    }
-                    MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.DISCONNECTED));
-                }
-            }
-        }
-    };
+public class DanaRExecutionService extends AbstractDanaRExecutionService{
 
     public DanaRExecutionService() {
+        log = LoggerFactory.getLogger(DanaRExecutionService.class);
+        mBinder = new LocalBinder();
+
         registerBus();
         MainApp.instance().getApplicationContext().registerReceiver(receiver, new IntentFilter(BluetoothDevice.ACTION_ACL_DISCONNECTED));
     }
@@ -133,17 +80,6 @@ public class DanaRExecutionService extends Service {
         }
     }
 
-    @Override
-    public IBinder onBind(Intent intent) {
-        return mBinder;
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-
-        return START_STICKY;
-    }
-
     private void registerBus() {
         try {
             MainApp.bus().unregister(this);
@@ -154,49 +90,27 @@ public class DanaRExecutionService extends Service {
     }
 
     @Subscribe
-    public void onStatusEvent(EventAppExit event) {
-        if (Config.logFunctionCalls)
-            log.debug("EventAppExit received");
-
+    public void onStatusEvent(final EventPreferenceChange pch) {
         if (mSerialIOThread != null)
-            mSerialIOThread.disconnect("Application exit");
-
-        MainApp.instance().getApplicationContext().unregisterReceiver(receiver);
-
-        stopSelf();
-        if (Config.logFunctionCalls)
-            log.debug("EventAppExit finished");
+            mSerialIOThread.disconnect("EventPreferenceChange");
     }
 
-    public boolean isConnected() {
-        return mRfcommSocket != null && mRfcommSocket.isConnected();
-    }
-
-    public boolean isConnecting() {
-        return connectionInProgress;
-    }
-
-    public void disconnect(String from) {
-        if (mSerialIOThread != null)
-            mSerialIOThread.disconnect(from);
-    }
-
-    public void connect(String from) {
-        if (danaRPump.password != -1 && danaRPump.password != SP.getInt(R.string.key_danar_password, -1)) {
+    public void connect() {
+        if (mDanaRPump.password != -1 && mDanaRPump.password != SP.getInt(R.string.key_danar_password, -1)) {
             ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.wrongpumppassword), R.raw.error);
             return;
         }
 
-        if (connectionInProgress)
+        if (mConnectionInProgress)
             return;
 
         new Thread(new Runnable() {
             @Override
             public void run() {
-                connectionInProgress = true;
+                mConnectionInProgress = true;
                 getBTSocketForSelectedPump();
                 if (mRfcommSocket == null || mBTDevice == null) {
-                    connectionInProgress = false;
+                    mConnectionInProgress = false;
                     return; // Device not found
                 }
 
@@ -217,48 +131,11 @@ public class DanaRExecutionService extends Service {
                     MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.CONNECTED, 0));
                 }
 
-                connectionInProgress = false;
+                mConnectionInProgress = false;
             }
         }).start();
     }
 
-    public void stopConnecting() {
-        if (mSerialIOThread != null)
-            mSerialIOThread.disconnect("stopConnecting");
-    }
-
-    private void getBTSocketForSelectedPump() {
-        devName = SP.getString(MainApp.sResources.getString(R.string.key_danar_bt_name), "");
-        BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
-
-        if (bluetoothAdapter != null) {
-            Set<BluetoothDevice> bondedDevices = bluetoothAdapter.getBondedDevices();
-
-            for (BluetoothDevice device : bondedDevices) {
-                if (devName.equals(device.getName())) {
-                    mBTDevice = device;
-                    try {
-                        mRfcommSocket = mBTDevice.createRfcommSocketToServiceRecord(SPP_UUID);
-                    } catch (IOException e) {
-                        log.error("Error creating socket: ", e);
-                    }
-                    break;
-                }
-            }
-        } else {
-            ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.nobtadapter));
-        }
-        if (mBTDevice == null) {
-            ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.devicenotfound));
-        }
-    }
-
-    @Subscribe
-    public void onStatusEvent(final EventPreferenceChange pch) {
-        if (mSerialIOThread != null)
-            mSerialIOThread.disconnect("EventPreferenceChange");
-    }
-
     public void getPumpStatus() {
         try {
             MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.gettingpumpstatus)));
@@ -268,7 +145,7 @@ public class DanaRExecutionService extends Service {
             MsgStatusBolusExtended exStatusMsg = new MsgStatusBolusExtended();
             MsgCheckValue checkValue = new MsgCheckValue();
 
-            if (danaRPump.isNewPump) {
+            if (mDanaRPump.isNewPump) {
                 mSerialIOThread.sendMessage(checkValue);
                 if (!checkValue.received) {
                     return;
@@ -283,8 +160,8 @@ public class DanaRExecutionService extends Service {
             mSerialIOThread.sendMessage(exStatusMsg);
             MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.gettingbolusstatus)));
 
-            Date now = new Date();
-            if (danaRPump.lastSettingsRead.getTime() + 60 * 60 * 1000L < now.getTime() || !MainApp.getSpecificPlugin(DanaRPlugin.class).isInitialized()) {
+            long now = System.currentTimeMillis();
+            if (mDanaRPump.lastSettingsRead + 60 * 60 * 1000L < now || !MainApp.getSpecificPlugin(DanaRPlugin.class).isInitialized()) {
                 MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.gettingpumpsettings)));
                 mSerialIOThread.sendMessage(new MsgSettingShippingInfo());
                 mSerialIOThread.sendMessage(new MsgSettingActiveProfile());
@@ -298,26 +175,26 @@ public class DanaRExecutionService extends Service {
                 mSerialIOThread.sendMessage(new MsgSettingProfileRatiosAll());
                 MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.gettingpumptime)));
                 mSerialIOThread.sendMessage(new MsgSettingPumpTime());
-                long timeDiff = (danaRPump.pumpTime.getTime() - System.currentTimeMillis()) / 1000L;
+                long timeDiff = (mDanaRPump.pumpTime.getTime() - System.currentTimeMillis()) / 1000L;
                 log.debug("Pump time difference: " + timeDiff + " seconds");
                 if (Math.abs(timeDiff) > 10) {
                     mSerialIOThread.sendMessage(new MsgSetTime(new Date()));
                     mSerialIOThread.sendMessage(new MsgSettingPumpTime());
-                    timeDiff = (danaRPump.pumpTime.getTime() - System.currentTimeMillis()) / 1000L;
+                    timeDiff = (mDanaRPump.pumpTime.getTime() - System.currentTimeMillis()) / 1000L;
                     log.debug("Pump time difference: " + timeDiff + " seconds");
                 }
-                danaRPump.lastSettingsRead = now;
+                mDanaRPump.lastSettingsRead = now;
             }
 
-            danaRPump.lastConnection = now;
+            mDanaRPump.lastConnection = now;
             MainApp.bus().post(new EventDanaRNewStatus());
             MainApp.bus().post(new EventInitializationChanged());
             NSUpload.uploadDeviceStatus();
-            if (danaRPump.dailyTotalUnits > danaRPump.maxDailyTotalUnits * Constants.dailyLimitWarning) {
-                log.debug("Approaching daily limit: " + danaRPump.dailyTotalUnits + "/" + danaRPump.maxDailyTotalUnits);
+            if (mDanaRPump.dailyTotalUnits > mDanaRPump.maxDailyTotalUnits * Constants.dailyLimitWarning) {
+                log.debug("Approaching daily limit: " + mDanaRPump.dailyTotalUnits + "/" + mDanaRPump.maxDailyTotalUnits);
                 Notification reportFail = new Notification(Notification.APPROACHING_DAILY_LIMIT, MainApp.sResources.getString(R.string.approachingdailylimit), Notification.URGENT);
                 MainApp.bus().post(new EventNewNotification(reportFail));
-                NSUpload.uploadError(MainApp.sResources.getString(R.string.approachingdailylimit) + ": " + danaRPump.dailyTotalUnits + "/" + danaRPump.maxDailyTotalUnits + "U");
+                NSUpload.uploadError(MainApp.sResources.getString(R.string.approachingdailylimit) + ": " + mDanaRPump.dailyTotalUnits + "/" + mDanaRPump.maxDailyTotalUnits + "U");
             }
         } catch (Exception e) {
             log.error("Unhandled exception", e);
@@ -326,10 +203,10 @@ public class DanaRExecutionService extends Service {
 
     public boolean tempBasal(int percent, int durationInHours) {
         if (!isConnected()) return false;
-        if (danaRPump.isTempBasalInProgress) {
+        if (mDanaRPump.isTempBasalInProgress) {
             MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.stoppingtempbasal)));
             mSerialIOThread.sendMessage(new MsgSetTempBasalStop());
-            waitMsec(500);
+            SystemClock.sleep(500);
         }
         MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.settingtempbasal)));
         mSerialIOThread.sendMessage(new MsgSetTempBasalStart(percent, durationInHours));
@@ -365,11 +242,16 @@ public class DanaRExecutionService extends Service {
         return true;
     }
 
-    public boolean bolus(double amount, int carbs, final Treatment t) {
+    @Override
+    public PumpEnactResult loadEvents() {
+        return null;
+    }
+
+    public boolean bolus(double amount, int carbs, long carbtime, final Treatment t) {
         if (!isConnected()) return false;
         if (BolusProgressDialog.stopPressed) return false;
 
-        bolusingTreatment = t;
+        mBolusingTreatment = t;
         int preferencesSpeed = SP.getInt(R.string.key_danars_bolusspeed, 0);
         MessageBase start;
         if (preferencesSpeed == 0)
@@ -379,7 +261,7 @@ public class DanaRExecutionService extends Service {
         MsgBolusStop stop = new MsgBolusStop(amount, t);
 
         if (carbs > 0) {
-            mSerialIOThread.sendMessage(new MsgSetCarbsEntry(System.currentTimeMillis(), carbs));
+            mSerialIOThread.sendMessage(new MsgSetCarbsEntry(carbtime, carbs));
         }
 
         MsgBolusProgress progress = new MsgBolusProgress(amount, t); // initialize static variables
@@ -392,20 +274,20 @@ public class DanaRExecutionService extends Service {
             return false;
         }
         while (!stop.stopped && !start.failed) {
-            waitMsec(100);
+            SystemClock.sleep(100);
             if ((System.currentTimeMillis() - progress.lastReceive) > 15 * 1000L) { // if i didn't receive status for more than 15 sec expecting broken comm
                 stop.stopped = true;
                 stop.forced = true;
                 log.debug("Communication stopped");
             }
         }
-        waitMsec(300);
+        SystemClock.sleep(300);
 
         EventOverviewBolusProgress bolusingEvent = EventOverviewBolusProgress.getInstance();
         bolusingEvent.t = t;
         bolusingEvent.percent = 99;
 
-        bolusingTreatment = null;
+        mBolusingTreatment = null;
 
         int speed = 12;
         switch (preferencesSpeed) {
@@ -437,11 +319,11 @@ public class DanaRExecutionService extends Service {
                 ConfigBuilderPlugin.getCommandQueue().independentConnect("bolusingInterrupted", new Callback() {
                     @Override
                     public void run() {
-                        if (danaRPump.lastBolusTime.getTime() > System.currentTimeMillis() - 60 * 1000L) { // last bolus max 1 min old
-                            t.insulin = danaRPump.lastBolusAmount;
-                            log.debug("Used bolus amount from history: " + danaRPump.lastBolusAmount);
+                        if (mDanaRPump.lastBolusTime.getTime() > System.currentTimeMillis() - 60 * 1000L) { // last bolus max 1 min old
+                            t.insulin = mDanaRPump.lastBolusAmount;
+                            log.debug("Used bolus amount from history: " + mDanaRPump.lastBolusAmount);
                         } else {
-                            log.debug("Bolus amount in history too old: " + danaRPump.lastBolusTime.toLocaleString());
+                            log.debug("Bolus amount in history too old: " + mDanaRPump.lastBolusTime.toLocaleString());
                         }
                         synchronized (o) {
                             o.notify();
@@ -460,22 +342,6 @@ public class DanaRExecutionService extends Service {
         return true;
     }
 
-    public void bolusStop() {
-        if (Config.logDanaBTComm)
-            log.debug("bolusStop >>>>> @ " + (bolusingTreatment == null ? "" : bolusingTreatment.insulin));
-        MsgBolusStop stop = new MsgBolusStop();
-        stop.forced = true;
-        if (isConnected()) {
-            mSerialIOThread.sendMessage(stop);
-            while (!stop.stopped) {
-                mSerialIOThread.sendMessage(stop);
-                waitMsec(200);
-            }
-        } else {
-            stop.stopped = true;
-        }
-    }
-
     public boolean carbsEntry(int amount) {
         if (!isConnected()) return false;
         MsgSetCarbsEntry msg = new MsgSetCarbsEntry(System.currentTimeMillis(), amount);
@@ -483,51 +349,9 @@ public class DanaRExecutionService extends Service {
         return true;
     }
 
-    public PumpEnactResult loadHistory(byte type) {
-        PumpEnactResult result = new PumpEnactResult();
-        if (!isConnected()) return result;
-        MessageBase msg = null;
-        switch (type) {
-            case RecordTypes.RECORD_TYPE_ALARM:
-                msg = new MsgHistoryAlarm();
-                break;
-            case RecordTypes.RECORD_TYPE_BASALHOUR:
-                msg = new MsgHistoryBasalHour();
-                break;
-            case RecordTypes.RECORD_TYPE_BOLUS:
-                msg = new MsgHistoryBolus();
-                break;
-            case RecordTypes.RECORD_TYPE_CARBO:
-                msg = new MsgHistoryCarbo();
-                break;
-            case RecordTypes.RECORD_TYPE_DAILY:
-                msg = new MsgHistoryDailyInsulin();
-                break;
-            case RecordTypes.RECORD_TYPE_ERROR:
-                msg = new MsgHistoryError();
-                break;
-            case RecordTypes.RECORD_TYPE_GLUCOSE:
-                msg = new MsgHistoryGlucose();
-                break;
-            case RecordTypes.RECORD_TYPE_REFILL:
-                msg = new MsgHistoryRefill();
-                break;
-            case RecordTypes.RECORD_TYPE_SUSPEND:
-                msg = new MsgHistorySuspend();
-                break;
-        }
-        MsgHistoryDone done = new MsgHistoryDone();
-        mSerialIOThread.sendMessage(new MsgPCCommStart());
-        waitMsec(400);
-        mSerialIOThread.sendMessage(msg);
-        while (!done.received && mRfcommSocket.isConnected()) {
-            waitMsec(100);
-        }
-        waitMsec(200);
-        mSerialIOThread.sendMessage(new MsgPCCommStop());
-        result.success = true;
-        result.comment = "OK";
-        return result;
+    @Override
+    public boolean highTempBasal(int percent) {
+        return false;
     }
 
     public boolean updateBasalsInPump(final Profile profile) {
@@ -538,13 +362,25 @@ public class DanaRExecutionService extends Service {
         mSerialIOThread.sendMessage(msgSet);
         MsgSetActivateBasalProfile msgActivate = new MsgSetActivateBasalProfile((byte) 0);
         mSerialIOThread.sendMessage(msgActivate);
-        danaRPump.lastSettingsRead = new Date(0); // force read full settings
+        mDanaRPump.lastSettingsRead = 0; // force read full settings
         getPumpStatus();
         MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.DISCONNECTING));
         return true;
     }
 
-    private void waitMsec(long msecs) {
-        SystemClock.sleep(msecs);
+    @Subscribe
+    public void onStatusEvent(EventAppExit event) {
+        if (Config.logFunctionCalls)
+            log.debug("EventAppExit received");
+
+        if (mSerialIOThread != null)
+            mSerialIOThread.disconnect("Application exit");
+
+        MainApp.instance().getApplicationContext().unregisterReceiver(receiver);
+
+        stopSelf();
+        if (Config.logFunctionCalls)
+            log.debug("EventAppExit finished");
     }
+
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java
index f269aff112..58392e65f9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java
@@ -5,71 +5,31 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
-import android.support.annotation.Nullable;
 
 import com.squareup.otto.Subscribe;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Date;
-import java.util.Objects;
-
-import info.nightscout.androidaps.BuildConfig;
 import info.nightscout.androidaps.Config;
-import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.events.EventPreferenceChange;
-import info.nightscout.androidaps.interfaces.ConstraintsInterface;
-import info.nightscout.androidaps.interfaces.DanaRInterface;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.ProfileInterface;
 import info.nightscout.androidaps.interfaces.PumpDescription;
-import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
-import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
-import info.nightscout.androidaps.plugins.ProfileNS.NSProfilePlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRFragment;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.PumpDanaR.AbstractDanaRPlugin;
 import info.nightscout.androidaps.plugins.PumpDanaRKorean.services.DanaRKoreanExecutionService;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
 import info.nightscout.utils.Round;
 import info.nightscout.utils.SP;
 
 /**
  * Created by mike on 05.08.2016.
  */
-public class DanaRKoreanPlugin implements PluginBase, PumpInterface, DanaRInterface, ConstraintsInterface, ProfileInterface {
-    private static Logger log = LoggerFactory.getLogger(DanaRKoreanPlugin.class);
-
-    @Override
-    public String getFragmentClass() {
-        return DanaRFragment.class.getName();
-    }
-
-    private static boolean fragmentPumpEnabled = false;
-    private static boolean fragmentProfileEnabled = false;
-    private static boolean fragmentPumpVisible = true;
-
-    private static DanaRKoreanExecutionService sExecutionService;
-
-
-    private static DanaRPump pump = DanaRPump.getInstance();
-    private boolean useExtendedBoluses = false;
+public class DanaRKoreanPlugin extends AbstractDanaRPlugin {
 
     private static DanaRKoreanPlugin plugin = null;
 
@@ -79,9 +39,8 @@ public class DanaRKoreanPlugin implements PluginBase, PumpInterface, DanaRInterf
         return plugin;
     }
 
-    public static PumpDescription pumpDescription = new PumpDescription();
-
     public DanaRKoreanPlugin() {
+        log = LoggerFactory.getLogger(DanaRKoreanPlugin.class);
         useExtendedBoluses = SP.getBoolean("danar_useextended", false);
 
         Context context = MainApp.instance().getApplicationContext();
@@ -112,6 +71,8 @@ public class DanaRKoreanPlugin implements PluginBase, PumpInterface, DanaRInterf
         pumpDescription.basalMinimumRate = 0.1d;
 
         pumpDescription.isRefillingCapable = true;
+
+        pumpDescription.storesCarbInfo = true;
     }
 
     private ServiceConnection mConnection = new ServiceConnection() {
@@ -147,83 +108,17 @@ public class DanaRKoreanPlugin implements PluginBase, PumpInterface, DanaRInterf
     }
 
     // Plugin base interface
-    @Override
-    public int getType() {
-        return PluginBase.PUMP;
-    }
-
     @Override
     public String getName() {
         return MainApp.instance().getString(R.string.danarkoreanpump);
     }
 
-    @Override
-    public String getNameShort() {
-        String name = MainApp.sResources.getString(R.string.danarpump_shortname);
-        if (!name.trim().isEmpty()) {
-            //only if translation exists
-            return name;
-        }
-        // use long name as fallback
-        return getName();
-    }
-
-    @Override
-    public boolean isEnabled(int type) {
-        if (type == PluginBase.PROFILE) return fragmentProfileEnabled && fragmentPumpEnabled;
-        else if (type == PluginBase.PUMP) return fragmentPumpEnabled;
-        else if (type == PluginBase.CONSTRAINTS) return fragmentPumpEnabled;
-        return false;
-    }
-
-    @Override
-    public boolean isVisibleInTabs(int type) {
-        if (type == PluginBase.PROFILE || type == PluginBase.CONSTRAINTS) return false;
-        else if (type == PluginBase.PUMP) return fragmentPumpVisible;
-        return false;
-    }
-
-    @Override
-    public boolean canBeHidden(int type) {
-        return true;
-    }
-
-    @Override
-    public boolean hasFragment() {
-        return true;
-    }
-
-    @Override
-    public boolean showInList(int type) {
-        return type == PUMP;
-    }
-
-    @Override
-    public void setFragmentEnabled(int type, boolean fragmentEnabled) {
-        if (type == PluginBase.PROFILE)
-            fragmentProfileEnabled = fragmentEnabled;
-        else if (type == PluginBase.PUMP)
-            fragmentPumpEnabled = fragmentEnabled;
-        // if pump profile was enabled need to switch to another too
-        if (type == PluginBase.PUMP && !fragmentEnabled && fragmentProfileEnabled) {
-            setFragmentEnabled(PluginBase.PROFILE, false);
-            setFragmentVisible(PluginBase.PROFILE, false);
-            NSProfilePlugin.getPlugin().setFragmentEnabled(PluginBase.PROFILE, true);
-            NSProfilePlugin.getPlugin().setFragmentVisible(PluginBase.PROFILE, true);
-        }
-    }
-
-    @Override
-    public void setFragmentVisible(int type, boolean fragmentVisible) {
-        if (type == PluginBase.PUMP)
-            fragmentPumpVisible = fragmentVisible;
-    }
-
     @Override
     public int getPreferencesId() {
         return R.xml.pref_danarkorean;
     }
 
+    // Pump interface
     @Override
     public boolean isFakingTempsByExtendedBoluses() {
         return useExtendedBoluses;
@@ -231,82 +126,7 @@ public class DanaRKoreanPlugin implements PluginBase, PumpInterface, DanaRInterf
 
     @Override
     public boolean isInitialized() {
-        return pump.lastConnection.getTime() > 0 &&  pump.maxBasal > 0 && !pump.isConfigUD && !pump.isEasyModeEnabled && pump.isExtendedBolusEnabled;
-    }
-
-    @Override
-    public boolean isSuspended() {
-        return pump.pumpSuspended;
-    }
-
-    @Override
-    public boolean isBusy() {
-        if (sExecutionService == null) return false;
-        return sExecutionService.isConnected() || sExecutionService.isConnecting();
-    }
-
-    // Pump interface
-    @Override
-    public PumpEnactResult setNewBasalProfile(Profile profile) {
-        PumpEnactResult result = new PumpEnactResult();
-
-        if (sExecutionService == null) {
-            log.error("setNewBasalProfile sExecutionService is null");
-            result.comment = "setNewBasalProfile sExecutionService is null";
-            return result;
-        }
-        if (!isInitialized()) {
-            log.error("setNewBasalProfile not initialized");
-            Notification notification = new Notification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, MainApp.sResources.getString(R.string.pumpNotInitializedProfileNotSet), Notification.URGENT);
-            MainApp.bus().post(new EventNewNotification(notification));
-            result.comment = MainApp.sResources.getString(R.string.pumpNotInitializedProfileNotSet);
-            return result;
-        } else {
-            MainApp.bus().post(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
-        }
-        if (!sExecutionService.updateBasalsInPump(profile)) {
-            Notification notification = new Notification(Notification.FAILED_UDPATE_PROFILE, MainApp.sResources.getString(R.string.failedupdatebasalprofile), Notification.URGENT);
-            MainApp.bus().post(new EventNewNotification(notification));
-            result.comment = MainApp.sResources.getString(R.string.failedupdatebasalprofile);
-            return result;
-        } else {
-            MainApp.bus().post(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
-            MainApp.bus().post(new EventDismissNotification(Notification.FAILED_UDPATE_PROFILE));
-            result.success = true;
-            result.enacted = true;
-            result.comment = "OK";
-            return result;
-        }
-    }
-
-    @Override
-    public boolean isThisProfileSet(Profile profile) {
-        if (!isInitialized())
-            return true; // TODO: not sure what's better. so far TRUE to prevent too many SMS
-        if (pump.pumpProfiles == null)
-            return true; // TODO: not sure what's better. so far TRUE to prevent too many SMS
-        int basalValues = pump.basal48Enable ? 48 : 24;
-        int basalIncrement = pump.basal48Enable ? 30 * 60 : 60 * 60;
-        for (int h = 0; h < basalValues; h++) {
-            Double pumpValue = pump.pumpProfiles[pump.activeProfile][h];
-            Double profileValue = profile.getBasal((Integer) (h * basalIncrement));
-            if (profileValue == null) return true;
-            if (Math.abs(pumpValue - profileValue) > getPumpDescription().basalStep) {
-                log.debug("Diff found. Hour: " + h + " Pump: " + pumpValue + " Profile: " + profileValue);
-                return false;
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public Date lastDataTime() {
-        return pump.lastConnection;
-    }
-
-    @Override
-    public double getBaseBasalRate() {
-        return pump.currentBasal;
+        return pump.lastConnection > 0 && pump.maxBasal > 0 && !pump.isConfigUD && !pump.isEasyModeEnabled && pump.isExtendedBolusEnabled;
     }
 
     @Override
@@ -316,7 +136,7 @@ public class DanaRKoreanPlugin implements PluginBase, PumpInterface, DanaRInterf
         if (detailedBolusInfo.insulin > 0 || detailedBolusInfo.carbs > 0) {
             Treatment t = new Treatment();
             boolean connectionOK = false;
-            if (detailedBolusInfo.insulin > 0 || detailedBolusInfo.carbs > 0) connectionOK = sExecutionService.bolus(detailedBolusInfo.insulin, (int) detailedBolusInfo.carbs, t);
+            if (detailedBolusInfo.insulin > 0 || detailedBolusInfo.carbs > 0) connectionOK = sExecutionService.bolus(detailedBolusInfo.insulin, (int) detailedBolusInfo.carbs, detailedBolusInfo.carbTime, t);
             PumpEnactResult result = new PumpEnactResult();
             result.success = connectionOK;
             result.bolusDelivered = t.insulin;
@@ -339,15 +159,6 @@ public class DanaRKoreanPlugin implements PluginBase, PumpInterface, DanaRInterf
         }
     }
 
-    @Override
-    public void stopBolusDelivering() {
-        if (sExecutionService == null) {
-            log.error("stopBolusDelivering sExecutionService is null");
-            return;
-        }
-        sExecutionService.bolusStop();
-    }
-
     // This is called from APS
     @Override
     public PumpEnactResult setTempBasalAbsolute(Double absoluteRate, Integer durationInMinutes, boolean enforceNew) {
@@ -500,100 +311,6 @@ public class DanaRKoreanPlugin implements PluginBase, PumpInterface, DanaRInterf
         return result;
     }
 
-    @Override
-    public PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes, boolean enforceNew) {
-        PumpEnactResult result = new PumpEnactResult();
-        ConfigBuilderPlugin configBuilderPlugin = MainApp.getConfigBuilder();
-        percent = configBuilderPlugin.applyBasalConstraints(percent);
-        if (percent < 0) {
-            result.isTempCancel = false;
-            result.enacted = false;
-            result.success = false;
-            result.comment = MainApp.instance().getString(R.string.danar_invalidinput);
-            log.error("setTempBasalPercent: Invalid input");
-            return result;
-        }
-        if (percent > getPumpDescription().maxTempPercent)
-            percent = getPumpDescription().maxTempPercent;
-        TemporaryBasal runningTB =  MainApp.getConfigBuilder().getRealTempBasalFromHistory(System.currentTimeMillis());
-        if (runningTB != null && runningTB.percentRate == percent && enforceNew) {
-            result.enacted = false;
-            result.success = true;
-            result.isTempCancel = false;
-            result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
-            result.duration = pump.tempBasalRemainingMin;
-            result.percent = pump.tempBasalPercent;
-            result.absolute = MainApp.getConfigBuilder().getTempBasalAbsoluteRateHistory();
-            result.isPercent = true;
-            if (Config.logPumpActions)
-                log.debug("setTempBasalPercent: Correct value already set");
-            return result;
-        }
-        int durationInHours = Math.max(durationInMinutes / 60, 1);
-        boolean connectionOK = sExecutionService.tempBasal(percent, durationInHours);
-        if (connectionOK && pump.isTempBasalInProgress && pump.tempBasalPercent == percent) {
-            result.enacted = true;
-            result.success = true;
-            result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
-            result.isTempCancel = false;
-            result.duration = pump.tempBasalRemainingMin;
-            result.percent = pump.tempBasalPercent;
-            result.absolute = MainApp.getConfigBuilder().getTempBasalAbsoluteRateHistory();
-            result.isPercent = true;
-            if (Config.logPumpActions)
-                log.debug("setTempBasalPercent: OK");
-            return result;
-        }
-        result.enacted = false;
-        result.success = false;
-        result.comment = MainApp.instance().getString(R.string.danar_valuenotsetproperly);
-        log.error("setTempBasalPercent: Failed to set temp basal");
-        return result;
-    }
-
-    @Override
-    public PumpEnactResult setExtendedBolus(Double insulin, Integer durationInMinutes) {
-        ConfigBuilderPlugin configBuilderPlugin = MainApp.getConfigBuilder();
-        insulin = configBuilderPlugin.applyBolusConstraints(insulin);
-        // needs to be rounded
-        int durationInHalfHours = Math.max(durationInMinutes / 30, 1);
-        insulin = Round.roundTo(insulin, getPumpDescription().extendedBolusStep);
-
-        PumpEnactResult result = new PumpEnactResult();
-        ExtendedBolus runningEB = MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis());
-        if (runningEB != null && Math.abs(runningEB.insulin - insulin) < getPumpDescription().extendedBolusStep) {
-            result.enacted = false;
-            result.success = true;
-            result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
-            result.duration = pump.extendedBolusRemainingMinutes;
-            result.absolute = pump.extendedBolusAbsoluteRate;
-            result.isPercent = false;
-            result.isTempCancel = false;
-            if (Config.logPumpActions)
-                log.debug("setExtendedBolus: Correct extended bolus already set. Current: " + pump.extendedBolusAmount + " Asked: " + insulin);
-            return result;
-        }
-        boolean connectionOK = sExecutionService.extendedBolus(insulin, durationInHalfHours);
-        if (connectionOK && pump.isExtendedInProgress && Math.abs(pump.extendedBolusAmount - insulin) < getPumpDescription().extendedBolusStep) {
-            result.enacted = true;
-            result.success = true;
-            result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
-            result.isTempCancel = false;
-            result.duration = pump.extendedBolusRemainingMinutes;
-            result.absolute = pump.extendedBolusAbsoluteRate;
-            result.bolusDelivered = pump.extendedBolusAmount;
-            result.isPercent = false;
-            if (Config.logPumpActions)
-                log.debug("setExtendedBolus: OK");
-            return result;
-        }
-        result.enacted = false;
-        result.success = false;
-        result.comment = MainApp.instance().getString(R.string.danar_valuenotsetproperly);
-        log.error("setExtendedBolus: Failed to extended bolus");
-        return result;
-    }
-
     @Override
     public PumpEnactResult cancelTempBasal(boolean force) {
         if (MainApp.getConfigBuilder().isInHistoryRealTempBasalInProgress())
@@ -634,257 +351,8 @@ public class DanaRKoreanPlugin implements PluginBase, PumpInterface, DanaRInterf
         }
     }
 
-    @Override
-    public PumpEnactResult cancelExtendedBolus() {
-        PumpEnactResult result = new PumpEnactResult();
-        ExtendedBolus runningEB = MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis());
-        if (runningEB != null) {
-            sExecutionService.extendedBolusStop();
-            result.enacted = true;
-            result.isTempCancel = true;
-        }
-        if (!pump.isExtendedInProgress) {
-            result.success = true;
-            result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
-            if (Config.logPumpActions)
-                log.debug("cancelExtendedBolus: OK");
-            return result;
-        } else {
-            result.success = false;
-            result.comment = MainApp.instance().getString(R.string.danar_valuenotsetproperly);
-            log.error("cancelExtendedBolus: Failed to cancel extended bolus");
-            return result;
-        }
-    }
-
-    @Override
-    public void connect(String from) {
-        if (sExecutionService != null) {
-            sExecutionService.connect(from);
-            pumpDescription.basalStep = pump.basalStep;
-            pumpDescription.bolusStep = pump.bolusStep;
-        }
-    }
-
-    @Override
-    public boolean isConnected() {
-        return sExecutionService != null && sExecutionService.isConnected();
-    }
-
-    @Override
-    public boolean isConnecting() {
-        return sExecutionService != null && sExecutionService.isConnecting();
-    }
-
-    @Override
-    public void disconnect(String from) {
-        if (sExecutionService != null) sExecutionService.disconnect(from);
-    }
-
-    @Override
-    public void stopConnecting() {
-        if (sExecutionService != null) sExecutionService.stopConnecting();
-    }
-
-    @Override
-    public void getPumpStatus() {
-        if (sExecutionService != null) sExecutionService.getPumpStatus();
-    }
-
-    @Override
-    public JSONObject getJSONStatus() {
-        if (pump.lastConnection.getTime() + 5 * 60 * 1000L < System.currentTimeMillis()) {
-            return null;
-        }
-        JSONObject pumpjson = new JSONObject();
-        JSONObject battery = new JSONObject();
-        JSONObject status = new JSONObject();
-        JSONObject extended = new JSONObject();
-        try {
-            battery.put("percent", pump.batteryRemaining);
-            status.put("status", pump.pumpSuspended ? "suspended" : "normal");
-            status.put("timestamp", DateUtil.toISOString(pump.lastConnection));
-            extended.put("Version", BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION);
-            extended.put("PumpIOB", pump.iob);
-            if (pump.lastBolusTime.getTime() != 0) {
-                extended.put("LastBolus", pump.lastBolusTime.toLocaleString());
-                extended.put("LastBolusAmount", pump.lastBolusAmount);
-            }
-            TemporaryBasal tb = MainApp.getConfigBuilder().getRealTempBasalFromHistory(System.currentTimeMillis());
-            if (tb != null) {
-                extended.put("TempBasalAbsoluteRate", tb.tempBasalConvertedToAbsolute(System.currentTimeMillis()));
-                extended.put("TempBasalStart", DateUtil.dateAndTimeString(tb.date));
-                extended.put("TempBasalRemaining", tb.getPlannedRemainingMinutes());
-            }
-            ExtendedBolus eb = MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis());
-            if (eb != null) {
-                extended.put("ExtendedBolusAbsoluteRate", eb.absoluteRate());
-                extended.put("ExtendedBolusStart", DateUtil.dateAndTimeString(eb.date));
-                extended.put("ExtendedBolusRemaining", eb.getPlannedRemainingMinutes());
-            }
-            extended.put("BaseBasalRate", getBaseBasalRate());
-            try {
-                extended.put("ActiveProfile", MainApp.getConfigBuilder().getProfileName());
-            } catch (Exception e) {
-            }
-
-            pumpjson.put("battery", battery);
-            pumpjson.put("status", status);
-            pumpjson.put("extended", extended);
-            pumpjson.put("reservoir", (int) pump.reservoirRemainingUnits);
-            pumpjson.put("clock", DateUtil.toISOString(new Date()));
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return pumpjson;
-    }
-
-    @Override
-    public String deviceID() {
-        return pump.serialNumber;
-    }
-
-    @Override
-    public PumpDescription getPumpDescription() {
-        return pumpDescription;
-    }
-
-    /**
-     * DanaR interface
-     */
-
-    @Override
-    public PumpEnactResult loadHistory(byte type) {
-        return sExecutionService.loadHistory(type);
-    }
-
     @Override
     public PumpEnactResult loadEvents() {
         return null; // no history, not needed
     }
-
-    /**
-     * Constraint interface
-     */
-
-    @Override
-    public boolean isLoopEnabled() {
-        return true;
-    }
-
-    @Override
-    public boolean isClosedModeEnabled() {
-        return true;
-    }
-
-    @Override
-    public boolean isAutosensModeEnabled() {
-        return true;
-    }
-
-    @Override
-    public boolean isAMAModeEnabled() {
-        return true;
-    }
-
-    @Override
-    public boolean isSMBModeEnabled() {
-        return true;
-    }
-
-    @SuppressWarnings("PointlessBooleanExpression")
-    @Override
-    public Double applyBasalConstraints(Double absoluteRate) {
-        double origAbsoluteRate = absoluteRate;
-        if (pump != null) {
-            if (absoluteRate > pump.maxBasal) {
-                absoluteRate = pump.maxBasal;
-                if (Config.logConstraintsChanges && origAbsoluteRate != Constants.basalAbsoluteOnlyForCheckLimit)
-                    log.debug("Limiting rate " + origAbsoluteRate + "U/h by pump constraint to " + absoluteRate + "U/h");
-            }
-        }
-        return absoluteRate;
-    }
-
-    @SuppressWarnings("PointlessBooleanExpression")
-    @Override
-    public Integer applyBasalConstraints(Integer percentRate) {
-        Integer origPercentRate = percentRate;
-        if (percentRate < 0) percentRate = 0;
-        if (percentRate > getPumpDescription().maxTempPercent)
-            percentRate = getPumpDescription().maxTempPercent;
-        if (!Objects.equals(percentRate, origPercentRate) && Config.logConstraintsChanges && !Objects.equals(origPercentRate, Constants.basalPercentOnlyForCheckLimit))
-            log.debug("Limiting percent rate " + origPercentRate + "% to " + percentRate + "%");
-        return percentRate;
-    }
-
-    @SuppressWarnings("PointlessBooleanExpression")
-    @Override
-    public Double applyBolusConstraints(Double insulin) {
-        double origInsulin = insulin;
-        if (pump != null) {
-            if (insulin > pump.maxBolus) {
-                insulin = pump.maxBolus;
-                if (Config.logConstraintsChanges && origInsulin != Constants.bolusOnlyForCheckLimit)
-                    log.debug("Limiting bolus " + origInsulin + "U by pump constraint to " + insulin + "U");
-            }
-        }
-        return insulin;
-    }
-
-    @Override
-    public Integer applyCarbsConstraints(Integer carbs) {
-        return carbs;
-    }
-
-    @Override
-    public Double applyMaxIOBConstraints(Double maxIob) {
-        return maxIob;
-    }
-
-    @Nullable
-    @Override
-    public ProfileStore getProfile() {
-        if (pump.lastSettingsRead.getTime() == 0)
-            return null; // no info now
-        return pump.createConvertedProfile();
-    }
-
-    @Override
-    public String getUnits() {
-        return pump.getUnits();
-    }
-
-    @Override
-    public String getProfileName() {
-        return pump.createConvertedProfileName();
-    }
-
-    // Reply for sms communicator
-    public String shortStatus(boolean veryShort) {
-        String ret = "";
-        if (pump.lastConnection.getTime() != 0) {
-            Long agoMsec = System.currentTimeMillis() - pump.lastConnection.getTime();
-            int agoMin = (int) (agoMsec / 60d / 1000d);
-            ret += "LastConn: " + agoMin + " minago\n";
-        }
-        if (pump.lastBolusTime.getTime() != 0) {
-            ret += "LastBolus: " + DecimalFormatter.to2Decimal(pump.lastBolusAmount) + "U @" + android.text.format.DateFormat.format("HH:mm", pump.lastBolusTime) + "\n";
-        }
-        if (MainApp.getConfigBuilder().isInHistoryRealTempBasalInProgress()) {
-            ret += "Temp: " + MainApp.getConfigBuilder().getRealTempBasalFromHistory(System.currentTimeMillis()).toStringFull() + "\n";
-        }
-        if (MainApp.getConfigBuilder().isInHistoryExtendedBoluslInProgress()) {
-            ret += "Extended: " + MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis()).toString() + "\n";
-        }
-        if (!veryShort) {
-            ret += "TDD: " + DecimalFormatter.to0Decimal(pump.dailyTotalUnits) + " / " + pump.maxDailyTotalUnits + " U\n";
-        }
-        ret += "IOB: " + pump.iob + "U\n";
-        ret += "Reserv: " + DecimalFormatter.to0Decimal(pump.reservoirRemainingUnits) + "U\n";
-        ret += "Batt: " + pump.batteryRemaining + "\n";
-        return ret;
-    }
-    // TODO: daily total constraint
-
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/SerialIOThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/SerialIOThread.java
index 8672afdcb0..9a8f3edb05 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/SerialIOThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/SerialIOThread.java
@@ -13,13 +13,14 @@ import java.io.OutputStream;
 import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
+import info.nightscout.androidaps.plugins.PumpDanaR.services.AbstractSerialIOThread;
 import info.nightscout.androidaps.plugins.PumpDanaRKorean.comm.MessageHashTable_k;
 import info.nightscout.utils.CRC;
 
 /**
  * Created by mike on 17.07.2016.
  */
-public class SerialIOThread extends Thread {
+public class SerialIOThread extends AbstractSerialIOThread {
     private static Logger log = LoggerFactory.getLogger(SerialIOThread.class);
 
     private InputStream mInputStream = null;
@@ -29,10 +30,10 @@ public class SerialIOThread extends Thread {
     private boolean mKeepRunning = true;
     private byte[] mReadBuff = new byte[0];
 
-    MessageBase processedMessage;
+    private MessageBase processedMessage;
 
     public SerialIOThread(BluetoothSocket rfcommSocket) {
-        super(SerialIOThread.class.toString());
+        super();
 
         mRfCommSocket = rfcommSocket;
         try {
@@ -138,6 +139,7 @@ public class SerialIOThread extends Thread {
         }
     }
 
+    @Override
     public synchronized void sendMessage(MessageBase message) {
         if (!mRfCommSocket.isConnected()) {
             log.error("Socket not connected on sendMessage");
@@ -173,6 +175,7 @@ public class SerialIOThread extends Thread {
         }
     }
 
+    @Override
     public void disconnect(String reason) {
         mKeepRunning = false;
         try {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgInitConnStatusTime_k.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgInitConnStatusTime_k.java
index 641dce79f3..3cf47b656f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgInitConnStatusTime_k.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgInitConnStatusTime_k.java
@@ -37,7 +37,7 @@ public class MsgInitConnStatusTime_k extends MessageBase {
             MainApp.getSpecificPlugin(DanaRKoreanPlugin.class).setFragmentVisible(PluginBase.PUMP, false);
             MainApp.getSpecificPlugin(DanaRPlugin.class).setFragmentEnabled(PluginBase.PUMP, true);
             MainApp.getSpecificPlugin(DanaRPlugin.class).setFragmentVisible(PluginBase.PUMP, true);
-            DanaRPump.getInstance().lastConnection = new Date(0); // mark not initialized
+            DanaRPump.getInstance().lastConnection = 0; // mark not initialized
 
             //If profile coming from pump, switch it as well
             if (MainApp.getSpecificPlugin(DanaRKoreanPlugin.class).isEnabled(PluginBase.PROFILE)) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgSettingBasal_k.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgSettingBasal_k.java
index 72a8be4e42..5c8b40b959 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgSettingBasal_k.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/comm/MsgSettingBasal_k.java
@@ -24,7 +24,7 @@ public class MsgSettingBasal_k extends MessageBase {
         pump.pumpProfiles[pump.activeProfile] = new double[24];
         for (int index = 0; index < 24; index++) {
             int basal = intFromBuff(bytes, 2 * index, 2);
-            if (basal < DanaRKoreanPlugin.pumpDescription.basalMinimumRate) basal = 0;
+            if (basal < DanaRKoreanPlugin.getPlugin().pumpDescription.basalMinimumRate) basal = 0;
             pump.pumpProfiles[pump.activeProfile][index] = basal / 100d;
         }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/services/DanaRKoreanExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/services/DanaRKoreanExecutionService.java
index 4efff4a5ad..6d1ccc132d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/services/DanaRKoreanExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/services/DanaRKoreanExecutionService.java
@@ -1,58 +1,36 @@
 package info.nightscout.androidaps.plugins.PumpDanaRKorean.services;
 
-import android.app.Service;
-import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothSocket;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Binder;
-import android.os.IBinder;
 import android.os.SystemClock;
 
 import com.squareup.otto.Subscribe;
 
-import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.Date;
-import java.util.Set;
-import java.util.UUID;
 
 import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.events.EventInitializationChanged;
 import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
-import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.BolusProgressDialog;
-import info.nightscout.androidaps.plugins.Overview.events.EventOverviewBolusProgress;
+import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusProgress;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusStart;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusStop;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryAlarm;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryBasalHour;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryBolus;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryCarbo;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryDailyInsulin;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryDone;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryError;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryGlucose;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistoryRefill;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgHistorySuspend;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgPCCommStart;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgPCCommStop;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetCarbsEntry;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetExtendedBolusStart;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetExtendedBolusStop;
@@ -68,56 +46,23 @@ import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingPumpTime;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingShippingInfo;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatusBolusExtended;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatusTempBasal;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.RecordTypes;
 import info.nightscout.androidaps.plugins.PumpDanaR.events.EventDanaRNewStatus;
+import info.nightscout.androidaps.plugins.PumpDanaR.services.AbstractDanaRExecutionService;
 import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin;
 import info.nightscout.androidaps.plugins.PumpDanaRKorean.SerialIOThread;
-import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.PumpDanaRKorean.comm.MsgCheckValue_k;
 import info.nightscout.androidaps.plugins.PumpDanaRKorean.comm.MsgSettingBasal_k;
 import info.nightscout.androidaps.plugins.PumpDanaRKorean.comm.MsgStatusBasic_k;
-import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.utils.NSUpload;
 import info.nightscout.utils.SP;
 import info.nightscout.utils.ToastUtils;
 
-public class DanaRKoreanExecutionService extends Service {
-    private static Logger log = LoggerFactory.getLogger(DanaRKoreanExecutionService.class);
-
-    private String devName;
-
-    private SerialIOThread mSerialIOThread;
-    private BluetoothSocket mRfcommSocket;
-    private BluetoothDevice mBTDevice;
-
-    private IBinder mBinder = new LocalBinder();
-
-    private DanaRPump danaRPump = DanaRPump.getInstance();
-    private Treatment bolusingTreatment = null;
-
-    private static Boolean connectionInProgress = false;
-
-    private static final UUID SPP_UUID = UUID.fromString("00001101-0000-1000-8000-00805f9b34fb");
-
-    private BroadcastReceiver receiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-            String action = intent.getAction();
-            if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)) {
-                log.debug("Device was disconnected " + device.getName());//Device was disconnected
-                if (mBTDevice != null && mBTDevice.getName() != null && mBTDevice.getName().equals(device.getName())) {
-                    if (mSerialIOThread != null) {
-                        mSerialIOThread.disconnect("BT disconnection broadcast");
-                    }
-                    MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.DISCONNECTED));
-                }
-            }
-        }
-    };
+public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
 
     public DanaRKoreanExecutionService() {
+        log = LoggerFactory.getLogger(DanaRKoreanExecutionService.class);
+        mBinder = new LocalBinder();
+
         registerBus();
         MainApp.instance().getApplicationContext().registerReceiver(receiver, new IntentFilter(BluetoothDevice.ACTION_ACL_DISCONNECTED));
     }
@@ -128,17 +73,6 @@ public class DanaRKoreanExecutionService extends Service {
         }
     }
 
-    @Override
-    public IBinder onBind(Intent intent) {
-        return mBinder;
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-
-        return START_STICKY;
-    }
-
     private void registerBus() {
         try {
             MainApp.bus().unregister(this);
@@ -163,35 +97,28 @@ public class DanaRKoreanExecutionService extends Service {
             log.debug("EventAppExit finished");
     }
 
-    public boolean isConnected() {
-        return mRfcommSocket != null && mRfcommSocket.isConnected();
-    }
-
-    public boolean isConnecting() {
-        return connectionInProgress;
-    }
-
-    public void disconnect(String from) {
+    @Subscribe
+    public void onStatusEvent(final EventPreferenceChange pch) {
         if (mSerialIOThread != null)
-            mSerialIOThread.disconnect(from);
+            mSerialIOThread.disconnect("EventPreferenceChange");
     }
 
-    public void connect(String from) {
-        if (danaRPump.password != -1 && danaRPump.password != SP.getInt(R.string.key_danar_password, -1)) {
+    public void connect() {
+        if (mDanaRPump.password != -1 && mDanaRPump.password != SP.getInt(R.string.key_danar_password, -1)) {
             ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.wrongpumppassword), R.raw.error);
             return;
         }
 
-        if (connectionInProgress)
+        if (mConnectionInProgress)
             return;
 
         new Thread(new Runnable() {
             @Override
             public void run() {
-                connectionInProgress = true;
+                mConnectionInProgress = true;
                 getBTSocketForSelectedPump();
                 if (mRfcommSocket == null || mBTDevice == null) {
-                    connectionInProgress = false;
+                    mConnectionInProgress = false;
                     return; // Device not found
                 }
 
@@ -212,48 +139,11 @@ public class DanaRKoreanExecutionService extends Service {
                     MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.CONNECTED, 0));
                 }
 
-                connectionInProgress = false;
+                mConnectionInProgress = false;
             }
         }).start();
     }
 
-    public void stopConnecting() {
-        if (mSerialIOThread != null)
-            mSerialIOThread.disconnect("stopConnecting");
-    }
-
-    private void getBTSocketForSelectedPump() {
-        devName = SP.getString(MainApp.sResources.getString(R.string.key_danar_bt_name), "");
-        BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
-
-        if (bluetoothAdapter != null) {
-            Set<BluetoothDevice> bondedDevices = bluetoothAdapter.getBondedDevices();
-
-            for (BluetoothDevice device : bondedDevices) {
-                if (devName.equals(device.getName())) {
-                    mBTDevice = device;
-                    try {
-                        mRfcommSocket = mBTDevice.createRfcommSocketToServiceRecord(SPP_UUID);
-                    } catch (IOException e) {
-                        log.error("Error creating socket: ", e);
-                    }
-                    break;
-                }
-            }
-        } else {
-            ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.nobtadapter));
-        }
-        if (mBTDevice == null) {
-            ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.devicenotfound));
-        }
-    }
-
-    @Subscribe
-    public void onStatusEvent(final EventPreferenceChange pch) {
-        if (mSerialIOThread != null)
-            mSerialIOThread.disconnect("EventPreferenceChange");
-    }
-
     public void getPumpStatus() {
         try {
             MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.gettingpumpstatus)));
@@ -263,7 +153,7 @@ public class DanaRKoreanExecutionService extends Service {
             MsgStatusBolusExtended exStatusMsg = new MsgStatusBolusExtended();
             MsgCheckValue_k checkValue = new MsgCheckValue_k();
 
-            if (danaRPump.isNewPump) {
+            if (mDanaRPump.isNewPump) {
                 mSerialIOThread.sendMessage(checkValue);
                 if (!checkValue.received) {
                     return;
@@ -278,8 +168,8 @@ public class DanaRKoreanExecutionService extends Service {
             mSerialIOThread.sendMessage(exStatusMsg);
             MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.gettingbolusstatus)));
 
-            Date now = new Date();
-            if (danaRPump.lastSettingsRead.getTime() + 60 * 60 * 1000L < now.getTime() || !MainApp.getSpecificPlugin(DanaRKoreanPlugin.class).isInitialized()) {
+            long now = System.currentTimeMillis();
+            if (mDanaRPump.lastSettingsRead + 60 * 60 * 1000L < now || !MainApp.getSpecificPlugin(DanaRKoreanPlugin.class).isInitialized()) {
                 MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.gettingpumpsettings)));
                 mSerialIOThread.sendMessage(new MsgSettingShippingInfo());
                 mSerialIOThread.sendMessage(new MsgSettingMeal());
@@ -290,39 +180,38 @@ public class DanaRKoreanExecutionService extends Service {
                 mSerialIOThread.sendMessage(new MsgSettingProfileRatios());
                 MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.gettingpumptime)));
                 mSerialIOThread.sendMessage(new MsgSettingPumpTime());
-                long timeDiff = (danaRPump.pumpTime.getTime() - System.currentTimeMillis()) / 1000L;
+                long timeDiff = (mDanaRPump.pumpTime.getTime() - System.currentTimeMillis()) / 1000L;
                 log.debug("Pump time difference: " + timeDiff + " seconds");
                 if (Math.abs(timeDiff) > 10) {
                     mSerialIOThread.sendMessage(new MsgSetTime(new Date()));
                     mSerialIOThread.sendMessage(new MsgSettingPumpTime());
-                    timeDiff = (danaRPump.pumpTime.getTime() - System.currentTimeMillis()) / 1000L;
+                    timeDiff = (mDanaRPump.pumpTime.getTime() - System.currentTimeMillis()) / 1000L;
                     log.debug("Pump time difference: " + timeDiff + " seconds");
                 }
-                danaRPump.lastSettingsRead = now;
+                mDanaRPump.lastSettingsRead = now;
             }
 
-            danaRPump.lastConnection = now;
+            mDanaRPump.lastConnection = now;
             MainApp.bus().post(new EventDanaRNewStatus());
             MainApp.bus().post(new EventInitializationChanged());
             NSUpload.uploadDeviceStatus();
-            if (danaRPump.dailyTotalUnits > danaRPump.maxDailyTotalUnits * Constants.dailyLimitWarning) {
-                log.debug("Approaching daily limit: " + danaRPump.dailyTotalUnits + "/" + danaRPump.maxDailyTotalUnits);
+            if (mDanaRPump.dailyTotalUnits > mDanaRPump.maxDailyTotalUnits * Constants.dailyLimitWarning) {
+                log.debug("Approaching daily limit: " + mDanaRPump.dailyTotalUnits + "/" + mDanaRPump.maxDailyTotalUnits);
                 Notification reportFail = new Notification(Notification.APPROACHING_DAILY_LIMIT, MainApp.sResources.getString(R.string.approachingdailylimit), Notification.URGENT);
                 MainApp.bus().post(new EventNewNotification(reportFail));
-                NSUpload.uploadError(MainApp.sResources.getString(R.string.approachingdailylimit) + ": " + danaRPump.dailyTotalUnits + "/" + danaRPump.maxDailyTotalUnits + "U");
+                NSUpload.uploadError(MainApp.sResources.getString(R.string.approachingdailylimit) + ": " + mDanaRPump.dailyTotalUnits + "/" + mDanaRPump.maxDailyTotalUnits + "U");
             }
         } catch (Exception e) {
             log.error("Unhandled exception", e);
         }
-        return;
     }
 
     public boolean tempBasal(int percent, int durationInHours) {
         if (!isConnected()) return false;
-        if (danaRPump.isTempBasalInProgress) {
+        if (mDanaRPump.isTempBasalInProgress) {
             MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.stoppingtempbasal)));
             mSerialIOThread.sendMessage(new MsgSetTempBasalStop());
-            waitMsec(500);
+            SystemClock.sleep(500);
         }
         MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.settingtempbasal)));
         mSerialIOThread.sendMessage(new MsgSetTempBasalStart(percent, durationInHours));
@@ -358,16 +247,21 @@ public class DanaRKoreanExecutionService extends Service {
         return true;
     }
 
-    public boolean bolus(double amount, int carbs, final Treatment t) {
+    @Override
+    public PumpEnactResult loadEvents() {
+        return null;
+    }
+
+    public boolean bolus(double amount, int carbs, long carbtime, final Treatment t) {
         if (!isConnected()) return false;
         if (BolusProgressDialog.stopPressed) return false;
 
-        bolusingTreatment = t;
+        mBolusingTreatment = t;
         MsgBolusStart start = new MsgBolusStart(amount);
         MsgBolusStop stop = new MsgBolusStop(amount, t);
 
         if (carbs > 0) {
-            mSerialIOThread.sendMessage(new MsgSetCarbsEntry(System.currentTimeMillis(), carbs));
+            mSerialIOThread.sendMessage(new MsgSetCarbsEntry(carbtime, carbs));
         }
 
         MsgBolusProgress progress = new MsgBolusProgress(amount, t); // initialize static variables
@@ -380,37 +274,21 @@ public class DanaRKoreanExecutionService extends Service {
             return false;
         }
         while (!stop.stopped && !start.failed) {
-            waitMsec(100);
+            SystemClock.sleep(100);
             if ((System.currentTimeMillis() - progress.lastReceive) > 15 * 1000L) { // if i didn't receive status for more than 15 sec expecting broken comm
                 stop.stopped = true;
                 stop.forced = true;
                 log.debug("Communication stopped");
             }
         }
-        waitMsec(300);
+        SystemClock.sleep(300);
 
-        bolusingTreatment = null;
+        mBolusingTreatment = null;
         ConfigBuilderPlugin.getCommandQueue().readStatus("bolusOK", null);
 
         return true;
     }
 
-    public void bolusStop() {
-        if (Config.logDanaBTComm)
-            log.debug("bolusStop >>>>> @ " + (bolusingTreatment == null ? "" : bolusingTreatment.insulin));
-        MsgBolusStop stop = new MsgBolusStop();
-        stop.forced = true;
-        if (isConnected()) {
-            mSerialIOThread.sendMessage(stop);
-            while (!stop.stopped) {
-                mSerialIOThread.sendMessage(stop);
-                waitMsec(200);
-            }
-        } else {
-            stop.stopped = true;
-        }
-    }
-
     public boolean carbsEntry(int amount) {
         if (!isConnected()) return false;
         MsgSetCarbsEntry msg = new MsgSetCarbsEntry(System.currentTimeMillis(), amount);
@@ -418,51 +296,9 @@ public class DanaRKoreanExecutionService extends Service {
         return true;
     }
 
-    public PumpEnactResult loadHistory(byte type) {
-        PumpEnactResult result = new PumpEnactResult();
-        if (!isConnected()) return result;
-        MessageBase msg = null;
-        switch (type) {
-            case RecordTypes.RECORD_TYPE_ALARM:
-                msg = new MsgHistoryAlarm();
-                break;
-            case RecordTypes.RECORD_TYPE_BASALHOUR:
-                msg = new MsgHistoryBasalHour();
-                break;
-            case RecordTypes.RECORD_TYPE_BOLUS:
-                msg = new MsgHistoryBolus();
-                break;
-            case RecordTypes.RECORD_TYPE_CARBO:
-                msg = new MsgHistoryCarbo();
-                break;
-            case RecordTypes.RECORD_TYPE_DAILY:
-                msg = new MsgHistoryDailyInsulin();
-                break;
-            case RecordTypes.RECORD_TYPE_ERROR:
-                msg = new MsgHistoryError();
-                break;
-            case RecordTypes.RECORD_TYPE_GLUCOSE:
-                msg = new MsgHistoryGlucose();
-                break;
-            case RecordTypes.RECORD_TYPE_REFILL:
-                msg = new MsgHistoryRefill();
-                break;
-            case RecordTypes.RECORD_TYPE_SUSPEND:
-                msg = new MsgHistorySuspend();
-                break;
-        }
-        MsgHistoryDone done = new MsgHistoryDone();
-        mSerialIOThread.sendMessage(new MsgPCCommStart());
-        waitMsec(400);
-        mSerialIOThread.sendMessage(msg);
-        while (!done.received && mRfcommSocket.isConnected()) {
-            waitMsec(100);
-        }
-        waitMsec(200);
-        mSerialIOThread.sendMessage(new MsgPCCommStop());
-        result.success = true;
-        result.comment = "OK";
-        return result;
+    @Override
+    public boolean highTempBasal(int percent) {
+        return false;
     }
 
     public boolean updateBasalsInPump(final Profile profile) {
@@ -471,13 +307,10 @@ public class DanaRKoreanExecutionService extends Service {
         double[] basal = DanaRPump.buildDanaRProfileRecord(profile);
         MsgSetSingleBasalProfile msgSet = new MsgSetSingleBasalProfile(basal);
         mSerialIOThread.sendMessage(msgSet);
-        danaRPump.lastSettingsRead = new Date(0); // force read full settings
+        mDanaRPump.lastSettingsRead = 0; // force read full settings
         getPumpStatus();
         MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.DISCONNECTING));
         return true;
     }
 
-    private void waitMsec(long msecs) {
-        SystemClock.sleep(msecs);
-    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/DanaRSPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/DanaRSPlugin.java
index ed9f98651f..9978880e08 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/DanaRSPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/DanaRSPlugin.java
@@ -189,6 +189,8 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface,
         pumpDescription.basalMinimumRate = 0.04d;
 
         pumpDescription.isRefillingCapable = true;
+
+        pumpDescription.storesCarbInfo = true;
     }
 
     private ServiceConnection mConnection = new ServiceConnection() {
@@ -346,7 +348,7 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface,
     @Nullable
     @Override
     public ProfileStore getProfile() {
-        if (pump.lastSettingsRead.getTime() == 0)
+        if (pump.lastSettingsRead == 0)
             return null; // no info now
         return pump.createConvertedProfile();
     }
@@ -365,7 +367,7 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface,
 
     @Override
     public boolean isInitialized() {
-        return pump.lastConnection.getTime() > 0  && pump.maxBasal > 0;
+        return pump.lastConnection > 0  && pump.maxBasal > 0;
     }
 
     @Override
@@ -436,7 +438,7 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface,
 
     @Override
     public Date lastDataTime() {
-        return pump.lastConnection;
+        return new Date(pump.lastConnection);
     }
 
     @Override
@@ -477,7 +479,7 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface,
             Treatment t = new Treatment();
             boolean connectionOK = false;
             if (detailedBolusInfo.insulin > 0 || carbs > 0)
-                connectionOK = danaRSService.bolus(detailedBolusInfo.insulin, (int) carbs, System.currentTimeMillis() + carbTime * 60 * 1000 + 1000, t); // +1000 to make the record different
+                connectionOK = danaRSService.bolus(detailedBolusInfo.insulin, (int) carbs, System.currentTimeMillis() + carbTime * 60 * 1000 + 30000, t); // +30s to make the record different
             PumpEnactResult result = new PumpEnactResult();
             result.success = connectionOK;
             result.bolusDelivered = t.insulin;
@@ -751,7 +753,7 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface,
 
     @Override
     public JSONObject getJSONStatus() {
-        if (pump.lastConnection.getTime() + 5 * 60 * 1000L < System.currentTimeMillis()) {
+        if (pump.lastConnection + 5 * 60 * 1000L < System.currentTimeMillis()) {
             return null;
         }
         JSONObject pumpjson = new JSONObject();
@@ -810,8 +812,8 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface,
     @Override
     public String shortStatus(boolean veryShort) {
         String ret = "";
-        if (pump.lastConnection.getTime() != 0) {
-            Long agoMsec = System.currentTimeMillis() - pump.lastConnection.getTime();
+        if (pump.lastConnection != 0) {
+            Long agoMsec = System.currentTimeMillis() - pump.lastConnection;
             int agoMin = (int) (agoMsec / 60d / 1000d);
             ret += "LastConn: " + agoMin + " minago\n";
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_APS_Set_Event_History.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_APS_Set_Event_History.java
index 4e559a77df..84ead83665 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_APS_Set_Event_History.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/comm/DanaRS_Packet_APS_Set_Event_History.java
@@ -9,6 +9,7 @@ import java.util.Calendar;
 import java.util.GregorianCalendar;
 
 import info.nightscout.androidaps.Config;
+import info.nightscout.utils.DateUtil;
 
 public class DanaRS_Packet_APS_Set_Event_History extends DanaRS_Packet {
     private static Logger log = LoggerFactory.getLogger(DanaRS_Packet_APS_Set_Event_History.class);
@@ -30,6 +31,8 @@ public class DanaRS_Packet_APS_Set_Event_History extends DanaRS_Packet {
         this.time = time;
         this.param1 = param1;
         this.param2 = param2;
+        if (Config.logDanaMessageDetail)
+            log.debug("Set history entry: " + DateUtil.dateAndTimeString(time) + " type: " + type + " param1: " + param1 + " param2: " + param2);
     }
 
     @Override
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/BLEComm.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/BLEComm.java
index f8d18a4d22..2901c4b863 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/BLEComm.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/BLEComm.java
@@ -164,6 +164,8 @@ public class BLEComm {
         scheduledDisconnection = null;
 
         if ((mBluetoothAdapter == null) || (mBluetoothGatt == null)) {
+            log.debug("disconnect not possible: (mBluetoothAdapter == null) " + (mBluetoothAdapter == null));
+            log.debug("disconnect not possible: (mBluetoothGatt == null) " + (mBluetoothGatt == null));
             return;
         }
         setCharacteristicNotification(getUARTReadBTGattChar(), false);
@@ -257,6 +259,8 @@ public class BLEComm {
         log.debug("setCharacteristicNotification");
         if ((mBluetoothAdapter == null) || (mBluetoothGatt == null)) {
             log.debug("BluetoothAdapter not initialized_ERROR");
+            isConnecting = false;
+            isConnected = false;
             return;
         }
         mBluetoothGatt.setCharacteristicNotification(characteristic, enabled);
@@ -266,20 +270,25 @@ public class BLEComm {
         log.debug("readCharacteristic");
         if ((mBluetoothAdapter == null) || (mBluetoothGatt == null)) {
             log.debug("BluetoothAdapter not initialized_ERROR");
+            isConnecting = false;
+            isConnected = false;
             return;
         }
         mBluetoothGatt.readCharacteristic(characteristic);
     }
 
     public void writeCharacteristic_NO_RESPONSE(final BluetoothGattCharacteristic characteristic, final byte[] data) {
-        if ((mBluetoothAdapter == null) || (mBluetoothGatt == null)) {
-            log.debug("BluetoothAdapter not initialized_ERROR");
-            return;
-        }
-
         new Thread(new Runnable() {
             public void run() {
                 SystemClock.sleep(WRITE_DELAY_MILLIS);
+
+                if ((mBluetoothAdapter == null) || (mBluetoothGatt == null)) {
+                    log.debug("BluetoothAdapter not initialized_ERROR");
+                    isConnecting = false;
+                    isConnected = false;
+                    return;
+                }
+
                 characteristic.setValue(data);
                 characteristic.setWriteType(BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE);
                 log.debug("writeCharacteristic:" + DanaRS_Packet.toHexString(data));
@@ -306,6 +315,8 @@ public class BLEComm {
         log.debug("getSupportedGattServices");
         if ((mBluetoothAdapter == null) || (mBluetoothGatt == null)) {
             log.debug("BluetoothAdapter not initialized_ERROR");
+            isConnecting = false;
+            isConnected = false;
             return null;
         }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/DanaRSService.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/DanaRSService.java
index 7790257640..1a1f74b645 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/DanaRSService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/DanaRSService.java
@@ -131,8 +131,8 @@ public class DanaRSService extends Service {
             MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.gettingtempbasalstatus)));
             bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Temporary_Basal_State());
 
-            Date now = new Date();
-            if (danaRPump.lastSettingsRead.getTime() + 60 * 60 * 1000L < now.getTime() || !MainApp.getSpecificPlugin(DanaRSPlugin.class).isInitialized()) {
+            long now = System.currentTimeMillis();
+            if (danaRPump.lastSettingsRead + 60 * 60 * 1000L < now || !MainApp.getSpecificPlugin(DanaRSPlugin.class).isInitialized()) {
                 MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.gettingpumpsettings)));
                 bleComm.sendMessage(new DanaRS_Packet_General_Get_Shipping_Information()); // serial no
                 bleComm.sendMessage(new DanaRS_Packet_General_Get_Pump_Check()); // firmware
@@ -357,7 +357,7 @@ public class DanaRSService extends Service {
         bleComm.sendMessage(msgSet);
         DanaRS_Packet_Basal_Set_Profile_Number msgActivate = new DanaRS_Packet_Basal_Set_Profile_Number(0);
         bleComm.sendMessage(msgActivate);
-        danaRPump.lastSettingsRead = new Date(0); // force read full settings
+        danaRPump.lastSettingsRead = 0; // force read full settings
         getPumpStatus();
         MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.DISCONNECTING));
         return true;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java
index b4eb969852..34a5b2381b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java
@@ -5,68 +5,31 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
-import android.support.annotation.Nullable;
 
 import com.squareup.otto.Subscribe;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Date;
-import java.util.Objects;
-
-import info.nightscout.androidaps.BuildConfig;
 import info.nightscout.androidaps.Config;
-import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.events.EventAppExit;
-import info.nightscout.androidaps.interfaces.ConstraintsInterface;
-import info.nightscout.androidaps.interfaces.DanaRInterface;
-import info.nightscout.androidaps.interfaces.PluginBase;
-import info.nightscout.androidaps.interfaces.ProfileInterface;
 import info.nightscout.androidaps.interfaces.PumpDescription;
-import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.ConfigBuilder.DetailedBolusInfoStorage;
-import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.Overview.events.EventDismissNotification;
-import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
-import info.nightscout.androidaps.plugins.ProfileNS.NSProfilePlugin;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRFragment;
-import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
+import info.nightscout.androidaps.plugins.PumpDanaR.AbstractDanaRPlugin;
 import info.nightscout.androidaps.plugins.PumpDanaRv2.services.DanaRv2ExecutionService;
-import info.nightscout.utils.DateUtil;
-import info.nightscout.utils.DecimalFormatter;
 import info.nightscout.utils.Round;
 import info.nightscout.utils.SP;
 
 /**
  * Created by mike on 05.08.2016.
  */
-public class DanaRv2Plugin implements PluginBase, PumpInterface, DanaRInterface, ConstraintsInterface, ProfileInterface {
-    private static Logger log = LoggerFactory.getLogger(DanaRv2Plugin.class);
-
-    @Override
-    public String getFragmentClass() {
-        return DanaRFragment.class.getName();
-    }
-
-    private static boolean fragmentPumpEnabled = false;
-    private static boolean fragmentProfileEnabled = false;
-    private static boolean fragmentPumpVisible = true;
-
-    private static DanaRv2ExecutionService sExecutionService;
-
+public class DanaRv2Plugin extends AbstractDanaRPlugin {
 
     private static DanaRv2Plugin plugin = null;
 
@@ -76,11 +39,10 @@ public class DanaRv2Plugin implements PluginBase, PumpInterface, DanaRInterface,
         return plugin;
     }
 
-    private static DanaRPump pump = DanaRPump.getInstance();
-
-    private static PumpDescription pumpDescription = new PumpDescription();
-
     private DanaRv2Plugin() {
+        log = LoggerFactory.getLogger(DanaRv2Plugin.class);
+        useExtendedBoluses = false;
+
         Context context = MainApp.instance().getApplicationContext();
         Intent intent = new Intent(context, DanaRv2ExecutionService.class);
         context.bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
@@ -109,6 +71,8 @@ public class DanaRv2Plugin implements PluginBase, PumpInterface, DanaRInterface,
         pumpDescription.basalMinimumRate = 0.04d;
 
         pumpDescription.isRefillingCapable = true;
+
+        pumpDescription.storesCarbInfo = true;
     }
 
     private ServiceConnection mConnection = new ServiceConnection() {
@@ -132,78 +96,11 @@ public class DanaRv2Plugin implements PluginBase, PumpInterface, DanaRInterface,
     }
 
     // Plugin base interface
-    @Override
-    public int getType() {
-        return PluginBase.PUMP;
-    }
-
     @Override
     public String getName() {
         return MainApp.instance().getString(R.string.danarv2pump);
     }
 
-    @Override
-    public String getNameShort() {
-        String name = MainApp.sResources.getString(R.string.danarpump_shortname);
-        if (!name.trim().isEmpty()) {
-            //only if translation exists
-            return name;
-        }
-        // use long name as fallback
-        return getName();
-    }
-
-    @Override
-    public boolean isEnabled(int type) {
-        if (type == PluginBase.PROFILE) return fragmentProfileEnabled && fragmentPumpEnabled;
-        else if (type == PluginBase.PUMP) return fragmentPumpEnabled;
-        else if (type == PluginBase.CONSTRAINTS) return fragmentPumpEnabled;
-        return false;
-    }
-
-    @Override
-    public boolean isVisibleInTabs(int type) {
-        if (type == PluginBase.PROFILE || type == PluginBase.CONSTRAINTS) return false;
-        else if (type == PluginBase.PUMP) return fragmentPumpVisible;
-        return false;
-    }
-
-    @Override
-    public boolean canBeHidden(int type) {
-        return true;
-    }
-
-    @Override
-    public boolean hasFragment() {
-        return true;
-    }
-
-    @Override
-    public boolean showInList(int type) {
-        return type == PUMP;
-    }
-
-    @Override
-    public void setFragmentEnabled(int type, boolean fragmentEnabled) {
-        if (type == PluginBase.PROFILE)
-            fragmentProfileEnabled = fragmentEnabled;
-        else if (type == PluginBase.PUMP)
-            fragmentPumpEnabled = fragmentEnabled;
-        // if pump profile was enabled need to switch to another too
-        if (type == PluginBase.PUMP && !fragmentEnabled && fragmentProfileEnabled) {
-            setFragmentEnabled(PluginBase.PROFILE, false);
-            setFragmentVisible(PluginBase.PROFILE, false);
-            NSProfilePlugin.getPlugin().setFragmentEnabled(PluginBase.PROFILE, true);
-            NSProfilePlugin.getPlugin().setFragmentVisible(PluginBase.PROFILE, true);
-        }
-    }
-
-    @Override
-    public void setFragmentVisible(int type, boolean fragmentVisible) {
-        if (type == PluginBase.PUMP)
-            fragmentPumpVisible = fragmentVisible;
-    }
-
     @Override
     public int getPreferencesId() {
         return R.xml.pref_danarv2;
@@ -216,86 +113,10 @@ public class DanaRv2Plugin implements PluginBase, PumpInterface, DanaRInterface,
 
     @Override
     public boolean isInitialized() {
-        return pump.lastConnection.getTime() > 0 && pump.maxBasal > 0;
-    }
-
-    @Override
-    public boolean isSuspended() {
-        return pump.pumpSuspended;
-    }
-
-    @Override
-    public boolean isBusy() {
-        if (sExecutionService == null) return false;
-        return sExecutionService.isConnected() || sExecutionService.isConnecting();
+        return pump.lastConnection > 0 && pump.maxBasal > 0;
     }
 
     // Pump interface
-    @Override
-    public PumpEnactResult setNewBasalProfile(Profile profile) {
-        PumpEnactResult result = new PumpEnactResult();
-
-        if (sExecutionService == null) {
-            log.error("setNewBasalProfile sExecutionService is null");
-            result.comment = "setNewBasalProfile sExecutionService is null";
-            return result;
-        }
-        if (!isInitialized()) {
-            log.error("setNewBasalProfile not initialized");
-            Notification notification = new Notification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, MainApp.sResources.getString(R.string.pumpNotInitializedProfileNotSet), Notification.URGENT);
-            MainApp.bus().post(new EventNewNotification(notification));
-            result.comment = MainApp.sResources.getString(R.string.pumpNotInitializedProfileNotSet);
-            return result;
-        } else {
-            MainApp.bus().post(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
-        }
-        if (!sExecutionService.updateBasalsInPump(profile)) {
-            Notification notification = new Notification(Notification.FAILED_UDPATE_PROFILE, MainApp.sResources.getString(R.string.failedupdatebasalprofile), Notification.URGENT);
-            MainApp.bus().post(new EventNewNotification(notification));
-            result.comment = MainApp.sResources.getString(R.string.failedupdatebasalprofile);
-            return result;
-        } else {
-            MainApp.bus().post(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
-            MainApp.bus().post(new EventDismissNotification(Notification.FAILED_UDPATE_PROFILE));
-            Notification notification = new Notification(Notification.PROFILE_SET_OK, MainApp.sResources.getString(R.string.profile_set_ok), Notification.INFO, 60);
-            MainApp.bus().post(new EventNewNotification(notification));
-            result.success = true;
-            result.enacted = true;
-            result.comment = "OK";
-            return result;
-        }
-    }
-
-    @Override
-    public boolean isThisProfileSet(Profile profile) {
-        if (!isInitialized())
-            return true; // TODO: not sure what's better. so far TRUE to prevent too many SMS
-        if (pump.pumpProfiles == null)
-            return true; // TODO: not sure what's better. so far TRUE to prevent too many SMS
-        int basalValues = pump.basal48Enable ? 48 : 24;
-        int basalIncrement = pump.basal48Enable ? 30 * 60 : 60 * 60;
-        for (int h = 0; h < basalValues; h++) {
-            Double pumpValue = pump.pumpProfiles[pump.activeProfile][h];
-            Double profileValue = profile.getBasal((Integer) (h * basalIncrement));
-            if (profileValue == null) return true;
-            if (Math.abs(pumpValue - profileValue) > getPumpDescription().basalStep) {
-                log.debug("Diff found. Hour: " + h + " Pump: " + pumpValue + " Profile: " + profileValue);
-                return false;
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public Date lastDataTime() {
-        return pump.lastConnection;
-    }
-
-    @Override
-    public double getBaseBasalRate() {
-        return pump.currentBasal;
-    }
-
     @Override
     public PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
         ConfigBuilderPlugin configBuilderPlugin = MainApp.getConfigBuilder();
@@ -329,7 +150,7 @@ public class DanaRv2Plugin implements PluginBase, PumpInterface, DanaRInterface,
             Treatment t = new Treatment();
             boolean connectionOK = false;
             if (detailedBolusInfo.insulin > 0 || carbs > 0)
-                connectionOK = sExecutionService.bolus(detailedBolusInfo.insulin, (int) carbs, System.currentTimeMillis() + carbTime * 60 * 1000 + 1000, t); // +1000 to make the record different
+                connectionOK = sExecutionService.bolus(detailedBolusInfo.insulin, (int) carbs, System.currentTimeMillis() + carbTime * 60 * 1000 + 30000, t); // +30s to make the record different
             PumpEnactResult result = new PumpEnactResult();
             result.success = connectionOK;
             result.bolusDelivered = t.insulin;
@@ -511,49 +332,6 @@ public class DanaRv2Plugin implements PluginBase, PumpInterface, DanaRInterface,
         return result;
     }
 
-    @Override
-    public PumpEnactResult setExtendedBolus(Double insulin, Integer durationInMinutes) {
-        ConfigBuilderPlugin configBuilderPlugin = MainApp.getConfigBuilder();
-        insulin = configBuilderPlugin.applyBolusConstraints(insulin);
-        // needs to be rounded
-        int durationInHalfHours = Math.max(durationInMinutes / 30, 1);
-        insulin = Round.roundTo(insulin, getPumpDescription().extendedBolusStep);
-
-        PumpEnactResult result = new PumpEnactResult();
-        ExtendedBolus runningEB = MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis());
-        if (runningEB != null && Math.abs(runningEB.insulin - insulin) < getPumpDescription().extendedBolusStep) {
-            result.enacted = false;
-            result.success = true;
-            result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
-            result.duration = pump.extendedBolusRemainingMinutes;
-            result.absolute = pump.extendedBolusAbsoluteRate;
-            result.isPercent = false;
-            result.isTempCancel = false;
-            if (Config.logPumpActions)
-                log.debug("setExtendedBolus: Correct extended bolus already set. Current: " + pump.extendedBolusAmount + " Asked: " + insulin);
-            return result;
-        }
-        boolean connectionOK = sExecutionService.extendedBolus(insulin, durationInHalfHours);
-        if (connectionOK && pump.isExtendedInProgress && Math.abs(pump.extendedBolusAmount - insulin) < getPumpDescription().extendedBolusStep) {
-            result.enacted = true;
-            result.success = true;
-            result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
-            result.isTempCancel = false;
-            result.duration = pump.extendedBolusRemainingMinutes;
-            result.absolute = pump.extendedBolusAbsoluteRate;
-            result.bolusDelivered = pump.extendedBolusAmount;
-            result.isPercent = false;
-            if (Config.logPumpActions)
-                log.debug("setExtendedBolus: OK");
-            return result;
-        }
-        result.enacted = false;
-        result.success = false;
-        result.comment = MainApp.instance().getString(R.string.danar_valuenotsetproperly);
-        log.error("setExtendedBolus: Failed to extended bolus");
-        return result;
-    }
-
     @Override
     public PumpEnactResult cancelTempBasal(boolean force) {
         PumpEnactResult result = new PumpEnactResult();
@@ -579,257 +357,8 @@ public class DanaRv2Plugin implements PluginBase, PumpInterface, DanaRInterface,
         }
     }
 
-    @Override
-    public PumpEnactResult cancelExtendedBolus() {
-        PumpEnactResult result = new PumpEnactResult();
-        ExtendedBolus runningEB = MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis());
-        if (runningEB != null) {
-            sExecutionService.extendedBolusStop();
-            result.enacted = true;
-            result.isTempCancel = true;
-        }
-        if (!pump.isExtendedInProgress) {
-            result.success = true;
-            result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
-            if (Config.logPumpActions)
-                log.debug("cancelExtendedBolus: OK");
-            return result;
-        } else {
-            result.success = false;
-            result.comment = MainApp.instance().getString(R.string.danar_valuenotsetproperly);
-            log.error("cancelExtendedBolus: Failed to cancel extended bolus");
-            return result;
-        }
-    }
-
-    @Override
-    public void connect(String from) {
-        if (sExecutionService != null) {
-            sExecutionService.connect(from);
-            pumpDescription.basalStep = pump.basalStep;
-            pumpDescription.bolusStep = pump.bolusStep;
-        }
-    }
-
-    @Override
-    public boolean isConnected() {
-        return sExecutionService != null && sExecutionService.isConnected();
-    }
-
-    @Override
-    public boolean isConnecting() {
-        return sExecutionService != null && sExecutionService.isConnecting();
-    }
-
-    @Override
-    public void disconnect(String from) {
-        if (sExecutionService != null) sExecutionService.disconnect(from);
-    }
-
-    @Override
-    public void stopConnecting() {
-        if (sExecutionService != null) sExecutionService.stopConnecting();
-    }
-
-    @Override
-    public void getPumpStatus() {
-        if (sExecutionService != null) sExecutionService.getPumpStatus();
-    }
-
-    @Override
-    public JSONObject getJSONStatus() {
-        if (pump.lastConnection.getTime() + 5 * 60 * 1000L < System.currentTimeMillis()) {
-            return null;
-        }
-        JSONObject pumpjson = new JSONObject();
-        JSONObject battery = new JSONObject();
-        JSONObject status = new JSONObject();
-        JSONObject extended = new JSONObject();
-        try {
-            battery.put("percent", pump.batteryRemaining);
-            status.put("status", pump.pumpSuspended ? "suspended" : "normal");
-            status.put("timestamp", DateUtil.toISOString(pump.lastConnection));
-            extended.put("Version", BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION);
-            extended.put("PumpIOB", pump.iob);
-            if (pump.lastBolusTime.getTime() != 0) {
-                extended.put("LastBolus", pump.lastBolusTime.toLocaleString());
-                extended.put("LastBolusAmount", pump.lastBolusAmount);
-            }
-            TemporaryBasal tb = MainApp.getConfigBuilder().getTempBasalFromHistory(System.currentTimeMillis());
-            if (tb != null) {
-                extended.put("TempBasalAbsoluteRate", tb.tempBasalConvertedToAbsolute(System.currentTimeMillis()));
-                extended.put("TempBasalStart", DateUtil.dateAndTimeString(tb.date));
-                extended.put("TempBasalRemaining", tb.getPlannedRemainingMinutes());
-            }
-            ExtendedBolus eb = MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis());
-            if (eb != null) {
-                extended.put("ExtendedBolusAbsoluteRate", eb.absoluteRate());
-                extended.put("ExtendedBolusStart", DateUtil.dateAndTimeString(eb.date));
-                extended.put("ExtendedBolusRemaining", eb.getPlannedRemainingMinutes());
-            }
-            extended.put("BaseBasalRate", getBaseBasalRate());
-            try {
-                extended.put("ActiveProfile", MainApp.getConfigBuilder().getProfileName());
-            } catch (Exception e) {
-            }
-
-            pumpjson.put("battery", battery);
-            pumpjson.put("status", status);
-            pumpjson.put("extended", extended);
-            pumpjson.put("reservoir", (int) pump.reservoirRemainingUnits);
-            pumpjson.put("clock", DateUtil.toISOString(new Date()));
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
-        }
-        return pumpjson;
-    }
-
-    @Override
-    public String deviceID() {
-        return pump.serialNumber;
-    }
-
-    @Override
-    public PumpDescription getPumpDescription() {
-        return pumpDescription;
-    }
-
-    /**
-     * DanaR interface
-     */
-
-    @Override
-    public PumpEnactResult loadHistory(byte type) {
-        return sExecutionService.loadHistory(type);
-    }
-
     @Override
     public PumpEnactResult loadEvents() {
         return sExecutionService.loadEvents();
     }
-
-    /**
-     * Constraint interface
-     */
-
-    @Override
-    public boolean isLoopEnabled() {
-        return true;
-    }
-
-    @Override
-    public boolean isClosedModeEnabled() {
-        return true;
-    }
-
-    @Override
-    public boolean isAutosensModeEnabled() {
-        return true;
-    }
-
-    @Override
-    public boolean isAMAModeEnabled() {
-        return true;
-    }
-
-   @Override
-    public boolean isSMBModeEnabled() {
-        return true;
-    }
-
-    @SuppressWarnings("PointlessBooleanExpression")
-    @Override
-    public Double applyBasalConstraints(Double absoluteRate) {
-        double origAbsoluteRate = absoluteRate;
-        if (pump != null) {
-            if (absoluteRate > pump.maxBasal) {
-                absoluteRate = pump.maxBasal;
-                if (Config.logConstraintsChanges && origAbsoluteRate != Constants.basalAbsoluteOnlyForCheckLimit)
-                    log.debug("Limiting rate " + origAbsoluteRate + "U/h by pump constraint to " + absoluteRate + "U/h");
-            }
-        }
-        return absoluteRate;
-    }
-
-    @SuppressWarnings("PointlessBooleanExpression")
-    @Override
-    public Integer applyBasalConstraints(Integer percentRate) {
-        Integer origPercentRate = percentRate;
-        if (percentRate < 0) percentRate = 0;
-        if (percentRate > getPumpDescription().maxTempPercent)
-            percentRate = getPumpDescription().maxTempPercent;
-        if (!Objects.equals(percentRate, origPercentRate) && Config.logConstraintsChanges && !Objects.equals(origPercentRate, Constants.basalPercentOnlyForCheckLimit))
-            log.debug("Limiting percent rate " + origPercentRate + "% to " + percentRate + "%");
-        return percentRate;
-    }
-
-    @SuppressWarnings("PointlessBooleanExpression")
-    @Override
-    public Double applyBolusConstraints(Double insulin) {
-        double origInsulin = insulin;
-        if (pump != null) {
-            if (insulin > pump.maxBolus) {
-                insulin = pump.maxBolus;
-                if (Config.logConstraintsChanges && origInsulin != Constants.bolusOnlyForCheckLimit)
-                    log.debug("Limiting bolus " + origInsulin + "U by pump constraint to " + insulin + "U");
-            }
-        }
-        return insulin;
-    }
-
-    @Override
-    public Integer applyCarbsConstraints(Integer carbs) {
-        return carbs;
-    }
-
-    @Override
-    public Double applyMaxIOBConstraints(Double maxIob) {
-        return maxIob;
-    }
-
-    @Nullable
-    @Override
-    public ProfileStore getProfile() {
-        if (pump.lastSettingsRead.getTime() == 0)
-            return null; // no info now
-        return pump.createConvertedProfile();
-    }
-
-    @Override
-    public String getUnits() {
-        return pump.getUnits();
-    }
-
-    @Override
-    public String getProfileName() {
-        return pump.createConvertedProfileName();
-    }
-
-    // Reply for sms communicator
-    public String shortStatus(boolean veryShort) {
-        String ret = "";
-        if (pump.lastConnection.getTime() != 0) {
-            Long agoMsec = System.currentTimeMillis() - pump.lastConnection.getTime();
-            int agoMin = (int) (agoMsec / 60d / 1000d);
-            ret += "LastConn: " + agoMin + " minago\n";
-        }
-        if (pump.lastBolusTime.getTime() != 0) {
-            ret += "LastBolus: " + DecimalFormatter.to2Decimal(pump.lastBolusAmount) + "U @" + android.text.format.DateFormat.format("HH:mm", pump.lastBolusTime) + "\n";
-        }
-        if (MainApp.getConfigBuilder().isInHistoryRealTempBasalInProgress()) {
-            ret += "Temp: " + MainApp.getConfigBuilder().getTempBasalFromHistory(System.currentTimeMillis()).toStringFull() + "\n";
-        }
-        if (MainApp.getConfigBuilder().isInHistoryExtendedBoluslInProgress()) {
-            ret += "Extended: " + MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis()).toString() + "\n";
-        }
-        if (!veryShort) {
-            ret += "TDD: " + DecimalFormatter.to0Decimal(pump.dailyTotalUnits) + " / " + pump.maxDailyTotalUnits + " U\n";
-        }
-        ret += "IOB: " + pump.iob + "U\n";
-        ret += "Reserv: " + DecimalFormatter.to0Decimal(pump.reservoirRemainingUnits) + "U\n";
-        ret += "Batt: " + pump.batteryRemaining + "\n";
-        return ret;
-    }
-    // TODO: daily total constraint
-
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/SerialIOThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/SerialIOThread.java
index 343a176e56..a12e2085aa 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/SerialIOThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/SerialIOThread.java
@@ -13,13 +13,14 @@ import java.io.OutputStream;
 import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
 import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
+import info.nightscout.androidaps.plugins.PumpDanaR.services.AbstractSerialIOThread;
 import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MessageHashTable_v2;
 import info.nightscout.utils.CRC;
 
 /**
  * Created by mike on 17.07.2016.
  */
-public class SerialIOThread extends Thread {
+public class SerialIOThread extends AbstractSerialIOThread {
     private static Logger log = LoggerFactory.getLogger(SerialIOThread.class);
 
     private InputStream mInputStream = null;
@@ -29,10 +30,10 @@ public class SerialIOThread extends Thread {
     private boolean mKeepRunning = true;
     private byte[] mReadBuff = new byte[0];
 
-    MessageBase processedMessage;
+    private MessageBase processedMessage;
 
     public SerialIOThread(BluetoothSocket rfcommSocket) {
-        super(SerialIOThread.class.toString());
+        super();
 
         mRfCommSocket = rfcommSocket;
         try {
@@ -138,6 +139,7 @@ public class SerialIOThread extends Thread {
         }
     }
 
+    @Override
     public synchronized void sendMessage(MessageBase message) {
         if (!mRfCommSocket.isConnected()) {
             log.error("Socket not connected on sendMessage");
@@ -173,6 +175,7 @@ public class SerialIOThread extends Thread {
         }
     }
 
+    @Override
     public void disconnect(String reason) {
         mKeepRunning = false;
         try {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgCheckValue_v2.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgCheckValue_v2.java
index 9869ef0895..60133d8d25 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgCheckValue_v2.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/comm/MsgCheckValue_v2.java
@@ -40,6 +40,7 @@ public class MsgCheckValue_v2 extends MessageBase {
         pump.protocol = intFromBuff(bytes, 1, 1);
         pump.productCode = intFromBuff(bytes, 2, 1);
         if (pump.model != DanaRPump.EXPORT_MODEL) {
+            pump.lastConnection = 0;
             Notification notification = new Notification(Notification.WRONG_DRIVER,  MainApp.sResources.getString(R.string.pumpdrivercorrected), Notification.NORMAL);
             MainApp.bus().post(new EventNewNotification(notification));
             MainApp.getSpecificPlugin(DanaRPlugin.class).disconnect("Wrong Model");
@@ -48,7 +49,7 @@ public class MsgCheckValue_v2 extends MessageBase {
             MainApp.getSpecificPlugin(DanaRKoreanPlugin.class).setFragmentVisible(PluginBase.PUMP, true);
             MainApp.getSpecificPlugin(DanaRPlugin.class).setFragmentEnabled(PluginBase.PUMP, false);
             MainApp.getSpecificPlugin(DanaRPlugin.class).setFragmentVisible(PluginBase.PUMP, false);
-            DanaRPump.getInstance().lastConnection = new Date(0); // mark not initialized
+            DanaRPump.getInstance().lastConnection = 0; // mark not initialized
 
             //If profile coming from pump, switch it as well
             if(MainApp.getSpecificPlugin(DanaRPlugin.class).isEnabled(PluginBase.PROFILE)){
@@ -63,6 +64,7 @@ public class MsgCheckValue_v2 extends MessageBase {
         }
 
         if (pump.protocol != 2) {
+            pump.lastConnection = 0;
             Notification notification = new Notification(Notification.WRONG_DRIVER,  MainApp.sResources.getString(R.string.pumpdrivercorrected), Notification.NORMAL);
             MainApp.bus().post(new EventNewNotification(notification));
             DanaRKoreanPlugin.getPlugin().disconnect("Wrong Model");
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
index 71a2f9ac79..81b5837511 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
@@ -1,52 +1,66 @@
 package info.nightscout.androidaps.plugins.PumpDanaRv2.services;
 
-import android.app.Service;
-import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothSocket;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Binder;
-import android.os.IBinder;
 import android.os.SystemClock;
 
 import com.squareup.otto.Subscribe;
 
-import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.Date;
-import java.util.Set;
-import java.util.UUID;
 
 import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.events.EventInitializationChanged;
 import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
-import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Overview.Dialogs.BolusProgressDialog;
-import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventOverviewBolusProgress;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
-import info.nightscout.androidaps.plugins.PumpDanaR.comm.*;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MessageBase;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusProgress;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusStart;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusStartWithSpeed;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgBolusStop;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetActivateBasalProfile;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetBasalProfile;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetCarbsEntry;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetExtendedBolusStart;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetExtendedBolusStop;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetTempBasalStart;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetTempBasalStop;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSetTime;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingActiveProfile;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingBasal;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingGlucose;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingMaxValues;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingMeal;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingProfileRatios;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingProfileRatiosAll;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingPumpTime;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgSettingShippingInfo;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatus;
+import info.nightscout.androidaps.plugins.PumpDanaR.comm.MsgStatusBasic;
 import info.nightscout.androidaps.plugins.PumpDanaR.events.EventDanaRNewStatus;
+import info.nightscout.androidaps.plugins.PumpDanaR.services.AbstractDanaRExecutionService;
 import info.nightscout.androidaps.plugins.PumpDanaRv2.DanaRv2Plugin;
 import info.nightscout.androidaps.plugins.PumpDanaRv2.SerialIOThread;
+import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgCheckValue_v2;
 import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgHistoryEvents_v2;
 import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgSetAPSTempBasalStart_v2;
 import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgSetHistoryEntry_v2;
-import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgCheckValue_v2;
 import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgStatusBolusExtended_v2;
 import info.nightscout.androidaps.plugins.PumpDanaRv2.comm.MsgStatusTempBasal_v2;
 import info.nightscout.androidaps.queue.Callback;
@@ -54,47 +68,16 @@ import info.nightscout.utils.NSUpload;
 import info.nightscout.utils.SP;
 import info.nightscout.utils.ToastUtils;
 
-public class DanaRv2ExecutionService extends Service {
-    private static Logger log = LoggerFactory.getLogger(DanaRv2ExecutionService.class);
-
-    private String devName;
-
-    private SerialIOThread mSerialIOThread;
-    private BluetoothSocket mRfcommSocket;
-    private BluetoothDevice mBTDevice;
-
-    private IBinder mBinder = new LocalBinder();
-
-    private DanaRPump danaRPump;
-    private Treatment bolusingTreatment = null;
-
-    private static Boolean connectionInProgress = false;
-
-    private static final UUID SPP_UUID = UUID.fromString("00001101-0000-1000-8000-00805f9b34fb");
+public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
 
     private long lastHistoryFetched = 0;
 
-    private BroadcastReceiver receiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-            String action = intent.getAction();
-            if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)) {
-                log.debug("Device was disconnected " + device.getName());//Device was disconnected
-                if (mBTDevice != null && mBTDevice.getName() != null && mBTDevice.getName().equals(device.getName())) {
-                    if (mSerialIOThread != null) {
-                        mSerialIOThread.disconnect("BT disconnection broadcast");
-                    }
-                    MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.DISCONNECTED));
-                }
-            }
-        }
-    };
-
     public DanaRv2ExecutionService() {
+        log = LoggerFactory.getLogger(DanaRv2ExecutionService.class);
+        mBinder = new LocalBinder();
+
         registerBus();
         MainApp.instance().getApplicationContext().registerReceiver(receiver, new IntentFilter(BluetoothDevice.ACTION_ACL_DISCONNECTED));
-        danaRPump = DanaRPump.getInstance();
     }
 
     public class LocalBinder extends Binder {
@@ -103,17 +86,6 @@ public class DanaRv2ExecutionService extends Service {
         }
     }
 
-    @Override
-    public IBinder onBind(Intent intent) {
-        return mBinder;
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-
-        return START_STICKY;
-    }
-
     private void registerBus() {
         try {
             MainApp.bus().unregister(this);
@@ -138,35 +110,28 @@ public class DanaRv2ExecutionService extends Service {
             log.debug("EventAppExit finished");
     }
 
-    public boolean isConnected() {
-        return mRfcommSocket != null && mRfcommSocket.isConnected();
-    }
-
-    public boolean isConnecting() {
-        return connectionInProgress;
-    }
-
-    public void disconnect(String from) {
+    @Subscribe
+    public void onStatusEvent(final EventPreferenceChange pch) {
         if (mSerialIOThread != null)
-            mSerialIOThread.disconnect(from);
+            mSerialIOThread.disconnect("EventPreferenceChange");
     }
 
-    public void connect(String from) {
-        if (danaRPump.password != -1 && danaRPump.password != SP.getInt(R.string.key_danar_password, -1)) {
+    public void connect() {
+        if (mDanaRPump.password != -1 && mDanaRPump.password != SP.getInt(R.string.key_danar_password, -1)) {
             ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.wrongpumppassword), R.raw.error);
             return;
         }
 
-        if (connectionInProgress)
+        if (mConnectionInProgress)
             return;
 
         new Thread(new Runnable() {
             @Override
             public void run() {
-                connectionInProgress = true;
+                mConnectionInProgress = true;
                 getBTSocketForSelectedPump();
                 if (mRfcommSocket == null || mBTDevice == null) {
-                    connectionInProgress = false;
+                    mConnectionInProgress = false;
                     return; // Device not found
                 }
 
@@ -187,48 +152,11 @@ public class DanaRv2ExecutionService extends Service {
                     MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.CONNECTED, 0));
                 }
 
-                connectionInProgress = false;
+                mConnectionInProgress = false;
             }
         }).start();
     }
 
-    public void stopConnecting() {
-        if (mSerialIOThread != null)
-            mSerialIOThread.disconnect("stopConnecting");
-    }
-
-    private void getBTSocketForSelectedPump() {
-        devName = SP.getString(MainApp.sResources.getString(R.string.key_danar_bt_name), "");
-        BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
-
-        if (bluetoothAdapter != null) {
-            Set<BluetoothDevice> bondedDevices = bluetoothAdapter.getBondedDevices();
-
-            for (BluetoothDevice device : bondedDevices) {
-                if (devName.equals(device.getName())) {
-                    mBTDevice = device;
-                    try {
-                        mRfcommSocket = mBTDevice.createRfcommSocketToServiceRecord(SPP_UUID);
-                    } catch (IOException e) {
-                        log.error("Error creating socket: ", e);
-                    }
-                    break;
-                }
-            }
-        } else {
-            ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.nobtadapter));
-        }
-        if (mBTDevice == null) {
-            ToastUtils.showToastInUiThread(MainApp.instance().getApplicationContext(), MainApp.sResources.getString(R.string.devicenotfound));
-        }
-    }
-
-    @Subscribe
-    public void onStatusEvent(final EventPreferenceChange pch) {
-        if (mSerialIOThread != null)
-            mSerialIOThread.disconnect("EventPreferenceChange");
-    }
-
     public void getPumpStatus() {
         try {
             MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.gettingpumpstatus)));
@@ -238,7 +166,7 @@ public class DanaRv2ExecutionService extends Service {
             MsgStatusBolusExtended_v2 exStatusMsg = new MsgStatusBolusExtended_v2();
             MsgCheckValue_v2 checkValue = new MsgCheckValue_v2();
 
-            if (danaRPump.isNewPump) {
+            if (mDanaRPump.isNewPump) {
                 mSerialIOThread.sendMessage(checkValue);
                 if (!checkValue.received) {
                     return;
@@ -253,8 +181,8 @@ public class DanaRv2ExecutionService extends Service {
             MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.gettingextendedbolusstatus)));
             mSerialIOThread.sendMessage(exStatusMsg);
 
-            Date now = new Date();
-            if (danaRPump.lastSettingsRead.getTime() + 60 * 60 * 1000L < now.getTime() || !MainApp.getSpecificPlugin(DanaRv2Plugin.class).isInitialized()) {
+            long now = System.currentTimeMillis();
+            if (mDanaRPump.lastSettingsRead + 60 * 60 * 1000L < now || !MainApp.getSpecificPlugin(DanaRv2Plugin.class).isInitialized()) {
                 MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.gettingpumpsettings)));
                 mSerialIOThread.sendMessage(new MsgSettingShippingInfo());
                 mSerialIOThread.sendMessage(new MsgSettingActiveProfile());
@@ -268,28 +196,28 @@ public class DanaRv2ExecutionService extends Service {
                 mSerialIOThread.sendMessage(new MsgSettingProfileRatiosAll());
                 MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.gettingpumptime)));
                 mSerialIOThread.sendMessage(new MsgSettingPumpTime());
-                long timeDiff = (danaRPump.pumpTime.getTime() - System.currentTimeMillis()) / 1000L;
+                long timeDiff = (mDanaRPump.pumpTime.getTime() - System.currentTimeMillis()) / 1000L;
                 log.debug("Pump time difference: " + timeDiff + " seconds");
                 if (Math.abs(timeDiff) > 10) {
                     mSerialIOThread.sendMessage(new MsgSetTime(new Date()));
                     mSerialIOThread.sendMessage(new MsgSettingPumpTime());
-                    timeDiff = (danaRPump.pumpTime.getTime() - System.currentTimeMillis()) / 1000L;
+                    timeDiff = (mDanaRPump.pumpTime.getTime() - System.currentTimeMillis()) / 1000L;
                     log.debug("Pump time difference: " + timeDiff + " seconds");
                 }
-                danaRPump.lastSettingsRead = now;
+                mDanaRPump.lastSettingsRead = now;
             }
 
             loadEvents();
 
-            danaRPump.lastConnection = now;
+            mDanaRPump.lastConnection = now;
             MainApp.bus().post(new EventDanaRNewStatus());
             MainApp.bus().post(new EventInitializationChanged());
             NSUpload.uploadDeviceStatus();
-            if (danaRPump.dailyTotalUnits > danaRPump.maxDailyTotalUnits * Constants.dailyLimitWarning) {
-                log.debug("Approaching daily limit: " + danaRPump.dailyTotalUnits + "/" + danaRPump.maxDailyTotalUnits);
+            if (mDanaRPump.dailyTotalUnits > mDanaRPump.maxDailyTotalUnits * Constants.dailyLimitWarning) {
+                log.debug("Approaching daily limit: " + mDanaRPump.dailyTotalUnits + "/" + mDanaRPump.maxDailyTotalUnits);
                 Notification reportFail = new Notification(Notification.APPROACHING_DAILY_LIMIT, MainApp.sResources.getString(R.string.approachingdailylimit), Notification.URGENT);
                 MainApp.bus().post(new EventNewNotification(reportFail));
-                NSUpload.uploadError(MainApp.sResources.getString(R.string.approachingdailylimit) + ": " + danaRPump.dailyTotalUnits + "/" + danaRPump.maxDailyTotalUnits + "U");
+                NSUpload.uploadError(MainApp.sResources.getString(R.string.approachingdailylimit) + ": " + mDanaRPump.dailyTotalUnits + "/" + mDanaRPump.maxDailyTotalUnits + "U");
             }
         } catch (Exception e) {
             log.error("Unhandled exception", e);
@@ -299,10 +227,10 @@ public class DanaRv2ExecutionService extends Service {
 
     public boolean tempBasal(int percent, int durationInHours) {
         if (!isConnected()) return false;
-        if (danaRPump.isTempBasalInProgress) {
+        if (mDanaRPump.isTempBasalInProgress) {
             MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.stoppingtempbasal)));
             mSerialIOThread.sendMessage(new MsgSetTempBasalStop());
-            waitMsec(500);
+            SystemClock.sleep(500);
         }
         MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.settingtempbasal)));
         mSerialIOThread.sendMessage(new MsgSetTempBasalStart(percent, durationInHours));
@@ -314,10 +242,10 @@ public class DanaRv2ExecutionService extends Service {
 
     public boolean highTempBasal(int percent) {
         if (!isConnected()) return false;
-        if (danaRPump.isTempBasalInProgress) {
+        if (mDanaRPump.isTempBasalInProgress) {
             MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.stoppingtempbasal)));
             mSerialIOThread.sendMessage(new MsgSetTempBasalStop());
-            waitMsec(500);
+            SystemClock.sleep(500);
         }
         MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.settingtempbasal)));
         mSerialIOThread.sendMessage(new MsgSetAPSTempBasalStart_v2(percent));
@@ -362,7 +290,7 @@ public class DanaRv2ExecutionService extends Service {
         if (BolusProgressDialog.stopPressed) return false;
 
         MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.startingbolus)));
-        bolusingTreatment = t;
+        mBolusingTreatment = t;
         final int preferencesSpeed = SP.getInt(R.string.key_danars_bolusspeed, 0);
         MessageBase start;
         if (preferencesSpeed == 0)
@@ -390,7 +318,7 @@ public class DanaRv2ExecutionService extends Service {
                 return false;
             }
             while (!stop.stopped && !start.failed) {
-                waitMsec(100);
+                SystemClock.sleep(100);
                 if ((System.currentTimeMillis() - progress.lastReceive) > 15 * 1000L) { // if i didn't receive status for more than 15 sec expecting broken comm
                     stop.stopped = true;
                     stop.forced = true;
@@ -403,7 +331,7 @@ public class DanaRv2ExecutionService extends Service {
         bolusingEvent.t = t;
         bolusingEvent.percent = 99;
 
-        bolusingTreatment = null;
+        mBolusingTreatment = null;
         int speed = 12;
         switch (preferencesSpeed) {
             case 0:
@@ -440,14 +368,14 @@ public class DanaRv2ExecutionService extends Service {
 
     public void bolusStop() {
         if (Config.logDanaBTComm)
-            log.debug("bolusStop >>>>> @ " + (bolusingTreatment == null ? "" : bolusingTreatment.insulin));
+            log.debug("bolusStop >>>>> @ " + (mBolusingTreatment == null ? "" : mBolusingTreatment.insulin));
         MsgBolusStop stop = new MsgBolusStop();
         stop.forced = true;
         if (isConnected()) {
             mSerialIOThread.sendMessage(stop);
             while (!stop.stopped) {
                 mSerialIOThread.sendMessage(stop);
-                waitMsec(200);
+                SystemClock.sleep(200);
             }
         } else {
             stop.stopped = true;
@@ -464,57 +392,10 @@ public class DanaRv2ExecutionService extends Service {
         return true;
     }
 
-    public PumpEnactResult loadHistory(byte type) {
-        PumpEnactResult result = new PumpEnactResult();
-        if (!isConnected()) return result;
-        MessageBase msg = null;
-        switch (type) {
-            case RecordTypes.RECORD_TYPE_ALARM:
-                msg = new MsgHistoryAlarm();
-                break;
-            case RecordTypes.RECORD_TYPE_BASALHOUR:
-                msg = new MsgHistoryBasalHour();
-                break;
-            case RecordTypes.RECORD_TYPE_BOLUS:
-                msg = new MsgHistoryBolus();
-                break;
-            case RecordTypes.RECORD_TYPE_CARBO:
-                msg = new MsgHistoryCarbo();
-                break;
-            case RecordTypes.RECORD_TYPE_DAILY:
-                msg = new MsgHistoryDailyInsulin();
-                break;
-            case RecordTypes.RECORD_TYPE_ERROR:
-                msg = new MsgHistoryError();
-                break;
-            case RecordTypes.RECORD_TYPE_GLUCOSE:
-                msg = new MsgHistoryGlucose();
-                break;
-            case RecordTypes.RECORD_TYPE_REFILL:
-                msg = new MsgHistoryRefill();
-                break;
-            case RecordTypes.RECORD_TYPE_SUSPEND:
-                msg = new MsgHistorySuspend();
-                break;
-        }
-        MsgHistoryDone done = new MsgHistoryDone();
-        mSerialIOThread.sendMessage(new MsgPCCommStart());
-        waitMsec(400);
-        mSerialIOThread.sendMessage(msg);
-        while (!done.received && mRfcommSocket.isConnected()) {
-            waitMsec(100);
-        }
-        waitMsec(200);
-        mSerialIOThread.sendMessage(new MsgPCCommStop());
-        result.success = true;
-        result.comment = "OK";
-        return result;
-    }
-
     public PumpEnactResult loadEvents() {
         if (!isConnected())
             return new PumpEnactResult().success(false);
-        waitMsec(300);
+        SystemClock.sleep(300);
         MsgHistoryEvents_v2 msg;
         if (lastHistoryFetched == 0) {
             msg = new MsgHistoryEvents_v2();
@@ -525,9 +406,9 @@ public class DanaRv2ExecutionService extends Service {
         }
         mSerialIOThread.sendMessage(msg);
         while (!msg.done && mRfcommSocket.isConnected()) {
-            waitMsec(100);
+            SystemClock.sleep(100);
         }
-        waitMsec(200);
+        SystemClock.sleep(200);
         if (MsgHistoryEvents_v2.lastEventTimeLoaded != 0)
             lastHistoryFetched = MsgHistoryEvents_v2.lastEventTimeLoaded - 45 * 60 * 1000L; //always load last 45 min;
         else
@@ -543,13 +424,10 @@ public class DanaRv2ExecutionService extends Service {
         mSerialIOThread.sendMessage(msgSet);
         MsgSetActivateBasalProfile msgActivate = new MsgSetActivateBasalProfile((byte) 0);
         mSerialIOThread.sendMessage(msgActivate);
-        danaRPump.lastSettingsRead = new Date(0); // force read full settings
+        mDanaRPump.lastSettingsRead = 0; // force read full settings
         getPumpStatus();
         MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.DISCONNECTING));
         return true;
     }
 
-    private void waitMsec(long msecs) {
-        SystemClock.sleep(msecs);
-    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/SensitivityAAPS/SensitivityAAPSPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/SensitivityAAPS/SensitivityAAPSPlugin.java
index f02cdd9371..f45d6cec40 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/SensitivityAAPS/SensitivityAAPSPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/SensitivityAAPS/SensitivityAAPSPlugin.java
@@ -11,6 +11,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
+import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Profile;
@@ -191,8 +192,10 @@ public class SensitivityAAPSPlugin implements PluginBase, SensitivityInterface{
             log.debug(ratioLimit);
         }
 
-        log.debug("Sensitivity to: " + new Date(toTime).toLocaleString() + " percentile: " + percentile + " ratio: " + ratio);
-        log.debug("Sensitivity to: deviations " + Arrays.toString(deviations));
+        if (Config.logAutosensData) {
+            log.debug("Sensitivity to: " + new Date(toTime).toLocaleString() + " percentile: " + percentile + " ratio: " + ratio + " mealCOB: " + current.cob);
+            log.debug("Sensitivity to: deviations " + Arrays.toString(deviations));
+        }
 
         AutosensResult output = new AutosensResult();
         output.ratio = Round.roundTo(ratio, 0.01);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/SensitivityOref0/SensitivityOref0Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/SensitivityOref0/SensitivityOref0Plugin.java
index 9aedf22d44..bf7d6ce8f5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/SensitivityOref0/SensitivityOref0Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/SensitivityOref0/SensitivityOref0Plugin.java
@@ -7,8 +7,10 @@ import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
+import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Profile;
@@ -118,7 +120,7 @@ public class SensitivityOref0Plugin implements PluginBase, SensitivityInterface
             return new AutosensResult();
         }
 
-        AutosensData current = IobCobCalculatorPlugin.getLastAutosensData("SensitivityOref0"); // this is running inside lock already
+        AutosensData current = IobCobCalculatorPlugin.getAutosensData(toTime); // this is running inside lock already
         if (current == null) {
             log.debug("No current autosens data available");
             return new AutosensResult();
@@ -199,10 +201,8 @@ public class SensitivityOref0Plugin implements PluginBase, SensitivityInterface
             log.debug(ratioLimit);
         }
 
-        double newisf = Math.round(Profile.toMgdl(sens, profile.getUnits()) / ratio);
-        if (ratio != 1) {
-            log.debug("ISF adjusted from " + Profile.toMgdl(sens, profile.getUnits()) + " to " + newisf);
-        }
+        if (Config.logAutosensData)
+            log.debug("Sensitivity to: " + new Date(toTime).toLocaleString() + " ratio: " + ratio + " mealCOB: " + current.cob);
 
         AutosensResult output = new AutosensResult();
         output.ratio = Round.roundTo(ratio, 0.01);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/SensitivityWeightedAverage/SensitivityWeightedAveragePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/SensitivityWeightedAverage/SensitivityWeightedAveragePlugin.java
index 046cd056fa..5f9e996a8a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/SensitivityWeightedAverage/SensitivityWeightedAveragePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/SensitivityWeightedAverage/SensitivityWeightedAveragePlugin.java
@@ -217,7 +217,7 @@ public class SensitivityWeightedAveragePlugin implements PluginBase, Sensitivity
         }
 
         if (Config.logAutosensData)
-            log.debug("Sensitivity to: " + new Date(toTime).toLocaleString() + " weightedaverage: " + average + " ratio: " + ratio);
+            log.debug("Sensitivity to: " + new Date(toTime).toLocaleString() + " weightedaverage: " + average + " ratio: " + ratio + " mealCOB: " + current.cob);
 
         AutosensResult output = new AutosensResult();
         output.ratio = Round.roundTo(ratio, 0.01);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/SourceDexcomG5/SourceDexcomG5Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/SourceDexcomG5/SourceDexcomG5Plugin.java
index 04f5700dae..193801ac28 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/SourceDexcomG5/SourceDexcomG5Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/SourceDexcomG5/SourceDexcomG5Plugin.java
@@ -82,4 +82,9 @@ public class SourceDexcomG5Plugin implements PluginBase, BgSourceInterface {
     public int getPreferencesId() {
         return R.xml.pref_dexcomg5;
     }
+
+    @Override
+    public boolean advancedFilteringSupported() {
+        return true;
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/SourceGlimp/SourceGlimpPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/SourceGlimp/SourceGlimpPlugin.java
index 51fd755b07..eb9a6b1c6b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/SourceGlimp/SourceGlimpPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/SourceGlimp/SourceGlimpPlugin.java
@@ -83,4 +83,8 @@ public class SourceGlimpPlugin implements PluginBase, BgSourceInterface {
     }
 
 
+    @Override
+    public boolean advancedFilteringSupported() {
+        return false;
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/SourceMM640g/SourceMM640gPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/SourceMM640g/SourceMM640gPlugin.java
index e530dd563b..1111c8c9eb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/SourceMM640g/SourceMM640gPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/SourceMM640g/SourceMM640gPlugin.java
@@ -83,4 +83,8 @@ public class SourceMM640gPlugin implements PluginBase, BgSourceInterface {
     }
 
 
+    @Override
+    public boolean advancedFilteringSupported() {
+        return false;
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/SourceNSClient/SourceNSClientPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/SourceNSClient/SourceNSClientPlugin.java
index 1928448f0e..f43c44047e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/SourceNSClient/SourceNSClientPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/SourceNSClient/SourceNSClientPlugin.java
@@ -85,4 +85,8 @@ public class SourceNSClientPlugin implements PluginBase, BgSourceInterface {
     }
 
 
+    @Override
+    public boolean advancedFilteringSupported() {
+        return true;
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/SourceXdrip/SourceXdripPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/SourceXdrip/SourceXdripPlugin.java
index 7f73d457e7..532492d40e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/SourceXdrip/SourceXdripPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/SourceXdrip/SourceXdripPlugin.java
@@ -84,4 +84,8 @@ public class SourceXdripPlugin implements PluginBase, BgSourceInterface {
     }
 
 
+    @Override
+    public boolean advancedFilteringSupported() {
+        return false;
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java
index 6fcbcfe951..b10ad96697 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java
@@ -20,6 +20,7 @@ import info.nightscout.androidaps.events.EventExtendedBolusChange;
 import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Treatments.fragments.TreatmentsBolusFragment;
+import info.nightscout.androidaps.plugins.Treatments.fragments.TreatmentsCareportalFragment;
 import info.nightscout.androidaps.plugins.Treatments.fragments.TreatmentsExtendedBolusesFragment;
 import info.nightscout.androidaps.plugins.Treatments.fragments.TreatmentsProfileSwitchFragment;
 import info.nightscout.androidaps.plugins.Treatments.fragments.TreatmentsTempTargetFragment;
@@ -33,6 +34,7 @@ public class TreatmentsFragment extends SubscriberFragment implements View.OnCli
     TextView tempBasalsTab;
     TextView tempTargetTab;
     TextView profileSwitchTab;
+    TextView careportalTab;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -45,11 +47,13 @@ public class TreatmentsFragment extends SubscriberFragment implements View.OnCli
             tempBasalsTab = (TextView) view.findViewById(R.id.treatments_tempbasals);
             tempTargetTab = (TextView) view.findViewById(R.id.treatments_temptargets);
             profileSwitchTab = (TextView) view.findViewById(R.id.treatments_profileswitches);
+            careportalTab = (TextView) view.findViewById(R.id.treatments_careportal);
             treatmentsTab.setOnClickListener(this);
             extendedBolusesTab.setOnClickListener(this);
             tempBasalsTab.setOnClickListener(this);
             tempTargetTab.setOnClickListener(this);
             profileSwitchTab.setOnClickListener(this);
+            careportalTab.setOnClickListener(this);
 
             setFragment(new TreatmentsBolusFragment());
             setBackgroundColorOnSelected(treatmentsTab);
@@ -87,6 +91,10 @@ public class TreatmentsFragment extends SubscriberFragment implements View.OnCli
                 setFragment(new TreatmentsProfileSwitchFragment());
                 setBackgroundColorOnSelected(profileSwitchTab);
                 break;
+            case R.id.treatments_careportal:
+                setFragment(new TreatmentsCareportalFragment());
+                setBackgroundColorOnSelected(careportalTab);
+                break;
         }
     }
 
@@ -104,6 +112,7 @@ public class TreatmentsFragment extends SubscriberFragment implements View.OnCli
         tempBasalsTab.setBackgroundColor(MainApp.sResources.getColor(R.color.defaultbackground));
         tempTargetTab.setBackgroundColor(MainApp.sResources.getColor(R.color.defaultbackground));
         profileSwitchTab.setBackgroundColor(MainApp.sResources.getColor(R.color.defaultbackground));
+        careportalTab.setBackgroundColor(MainApp.sResources.getColor(R.color.defaultbackground));
         selected.setBackgroundColor(MainApp.sResources.getColor(R.color.tabBgColorSelected));
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java
index 900eba7a40..dad53a0560 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java
@@ -8,6 +8,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import info.nightscout.androidaps.Config;
@@ -197,6 +198,8 @@ public class TreatmentsPlugin implements PluginBase, TreatmentsInterface {
             Iob tIOB = t.iobCalc(time, dia);
             total.iob += tIOB.iobContrib;
             total.activity += tIOB.activityContrib;
+            if (t.date > total.lastBolusTime)
+                total.lastBolusTime = t.date;
             if (!t.isSMB) {
                 // instead of dividing the DIA that only worked on the bilinear curves,
                 // multiply the time the treatment is seen active.
@@ -204,9 +207,6 @@ public class TreatmentsPlugin implements PluginBase, TreatmentsInterface {
                 long snoozeTime = t.date + (long) (timeSinceTreatment * SP.getDouble("openapsama_bolussnooze_dia_divisor", 2.0));
                 Iob bIOB = t.iobCalc(snoozeTime, dia);
                 total.bolussnooze += bIOB.iobContrib;
-            } else {
-                total.basaliob += t.insulin;
-                total.microBolusIOB += tIOB.iobContrib;
             }
         }
 
@@ -244,6 +244,7 @@ public class TreatmentsPlugin implements PluginBase, TreatmentsInterface {
             if (t > dia_ago && t <= now) {
                 if (treatment.carbs >= 1) {
                     result.carbs += treatment.carbs;
+                    result.lastCarbTime = t;
                 }
                 if (treatment.insulin > 0 && treatment.mealBolus) {
                     result.boluses += treatment.insulin;
@@ -254,7 +255,10 @@ public class TreatmentsPlugin implements PluginBase, TreatmentsInterface {
         AutosensData autosensData = IobCobCalculatorPlugin.getLastAutosensDataSynchronized("getMealData()");
         if (autosensData != null) {
             result.mealCOB = autosensData.cob;
+            result.slopeFromMinDeviation = autosensData.slopeFromMinDeviation;
+            result.slopeFromMaxDeviation = autosensData.slopeFromMaxDeviation;
         }
+        result.lastBolusTime = getLastBolusTime();
         return result;
     }
 
@@ -276,6 +280,18 @@ public class TreatmentsPlugin implements PluginBase, TreatmentsInterface {
         return in5minback;
     }
 
+    @Override
+    public long getLastBolusTime() {
+        long now = System.currentTimeMillis();
+        long last = 0;
+        for (Treatment t : treatments) {
+            if (t.date > last && t.insulin > 0 && t.isValid && t.date <= now)
+                last = t.date;
+        }
+        log.debug("Last bolus time: " + new Date(last).toLocaleString());
+        return last;
+    }
+
     @Override
     public boolean isInHistoryRealTempBasalInProgress() {
         return getRealTempBasalFromHistory(System.currentTimeMillis()) != null;
@@ -327,6 +343,12 @@ public class TreatmentsPlugin implements PluginBase, TreatmentsInterface {
                 IobTotal calc = t.iobCalc(time);
                 //log.debug("BasalIOB " + new Date(time) + " >>> " + calc.basaliob);
                 total.plus(calc);
+                if (!t.isEndingEvent()) {
+                    total.lastTempDate = t.date;
+                    total.lastTempDuration = t.durationInMinutes;
+                    total.lastTempRate = t.tempBasalConvertedToAbsolute(t.date);
+                }
+
             }
         }
         if (ConfigBuilderPlugin.getActivePump().isFakingTempsByExtendedBoluses()) {
@@ -337,6 +359,12 @@ public class TreatmentsPlugin implements PluginBase, TreatmentsInterface {
                     if (e.date > time) continue;
                     IobTotal calc = e.iobCalc(time);
                     totalExt.plus(calc);
+                    TemporaryBasal t = new TemporaryBasal(e);
+                    if (!t.isEndingEvent() && t.date > total.lastTempDate) {
+                        total.lastTempDate = t.date;
+                        total.lastTempDuration = t.durationInMinutes;
+                        total.lastTempRate = t.tempBasalConvertedToAbsolute(t.date);
+                    }
                 }
             }
             // Convert to basal iob
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsBolusFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsBolusFragment.java
index d096fd8549..99c89f0706 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsBolusFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsBolusFragment.java
@@ -81,7 +81,7 @@ public class TreatmentsBolusFragment extends SubscriberFragment implements View.
             Iob iob = t.iobCalc(System.currentTimeMillis(), profile.getDia());
             holder.iob.setText(DecimalFormatter.to2Decimal(iob.iobContrib) + " U");
             holder.activity.setText(DecimalFormatter.to3Decimal(iob.activityContrib) + " U");
-            holder.mealOrCorrection.setText(t.mealBolus ? MainApp.sResources.getString(R.string.mealbolus) : MainApp.sResources.getString(R.string.correctionbous));
+            holder.mealOrCorrection.setText(t.isSMB ? "SMB" : t.mealBolus ? MainApp.sResources.getString(R.string.mealbolus) : MainApp.sResources.getString(R.string.correctionbous));
             holder.ph.setVisibility(t.source == Source.PUMP ? View.VISIBLE : View.GONE);
             holder.ns.setVisibility(NSUpload.isIdValid(t._id) ? View.VISIBLE : View.GONE);
             holder.invalid.setVisibility(t.isValid ? View.GONE : View.VISIBLE);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsCareportalFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsCareportalFragment.java
new file mode 100644
index 0000000000..7218198b43
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsCareportalFragment.java
@@ -0,0 +1,192 @@
+package info.nightscout.androidaps.plugins.Treatments.fragments;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.graphics.Paint;
+import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.CardView;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.squareup.otto.Subscribe;
+
+import java.util.List;
+
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.Services.Intents;
+import info.nightscout.androidaps.db.CareportalEvent;
+import info.nightscout.androidaps.events.EventCareportalEventChange;
+import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
+import info.nightscout.androidaps.plugins.NSClientInternal.UploadQueue;
+import info.nightscout.utils.DateUtil;
+import info.nightscout.utils.NSUpload;
+import info.nightscout.utils.SP;
+import info.nightscout.utils.Translator;
+
+/**
+ * Created by mike on 13/01/17.
+ */
+
+public class TreatmentsCareportalFragment extends SubscriberFragment implements View.OnClickListener {
+
+    RecyclerView recyclerView;
+    LinearLayoutManager llm;
+    Button refreshFromNS;
+
+    Context context;
+
+    public class RecyclerViewAdapter extends RecyclerView.Adapter<RecyclerViewAdapter.CareportalEventsViewHolder> {
+
+        List<CareportalEvent> careportalEventList;
+
+        RecyclerViewAdapter(List<CareportalEvent> careportalEventList) {
+            this.careportalEventList = careportalEventList;
+        }
+
+        @Override
+        public CareportalEventsViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewType) {
+            View v = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.treatments_careportal_item, viewGroup, false);
+            CareportalEventsViewHolder CareportalEventsViewHolder = new CareportalEventsViewHolder(v);
+            return CareportalEventsViewHolder;
+        }
+
+        @Override
+        public void onBindViewHolder(CareportalEventsViewHolder holder, int position) {
+            CareportalEvent careportalEvent = careportalEventList.get(position);
+            holder.ns.setVisibility(NSUpload.isIdValid(careportalEvent._id) ? View.VISIBLE : View.GONE);
+            holder.date.setText(DateUtil.dateAndTimeString(careportalEvent.date));
+            holder.note.setText(careportalEvent.getNotes());
+            holder.type.setText(Translator.translate(careportalEvent.eventType));
+            holder.remove.setTag(careportalEvent);
+        }
+
+        @Override
+        public int getItemCount() {
+            return careportalEventList.size();
+        }
+
+        @Override
+        public void onAttachedToRecyclerView(RecyclerView recyclerView) {
+            super.onAttachedToRecyclerView(recyclerView);
+        }
+
+        public class CareportalEventsViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
+            CardView cv;
+            TextView date;
+            TextView type;
+            TextView note;
+            TextView remove;
+            TextView ns;
+
+            CareportalEventsViewHolder(View itemView) {
+                super(itemView);
+                cv = (CardView) itemView.findViewById(R.id.careportal_cardview);
+                date = (TextView) itemView.findViewById(R.id.careportal_date);
+                type = (TextView) itemView.findViewById(R.id.careportal_type);
+                note = (TextView) itemView.findViewById(R.id.careportal_note);
+                ns = (TextView) itemView.findViewById(R.id.ns_sign);
+                remove = (TextView) itemView.findViewById(R.id.careportal_remove);
+                remove.setOnClickListener(this);
+                remove.setPaintFlags(remove.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
+            }
+
+            @Override
+            public void onClick(View v) {
+                final CareportalEvent careportalEvent = (CareportalEvent) v.getTag();
+                switch (v.getId()) {
+                    case R.id.careportal_remove:
+                        AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                        builder.setTitle(MainApp.sResources.getString(R.string.confirmation));
+                        builder.setMessage(MainApp.sResources.getString(R.string.removerecord) + "\n" + DateUtil.dateAndTimeString(careportalEvent.date));
+                        builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int id) {
+                                final String _id = careportalEvent._id;
+                                if (NSUpload.isIdValid(_id)) {
+                                    NSUpload.removeCareportalEntryFromNS(_id);
+                                } else {
+                                    UploadQueue.removeID("dbAdd", _id);
+                                }
+                                MainApp.getDbHelper().delete(careportalEvent);
+                            }
+                        });
+                        builder.setNegativeButton(MainApp.sResources.getString(R.string.cancel), null);
+                        builder.show();
+                        break;
+                }
+            }
+        }
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.treatments_careportal_fragment, container, false);
+
+        recyclerView = (RecyclerView) view.findViewById(R.id.careportal_recyclerview);
+        recyclerView.setHasFixedSize(true);
+        llm = new LinearLayoutManager(view.getContext());
+        recyclerView.setLayoutManager(llm);
+
+        RecyclerViewAdapter adapter = new RecyclerViewAdapter(MainApp.getDbHelper().getCareportalEventsFromTime(false));
+        recyclerView.setAdapter(adapter);
+
+        refreshFromNS = (Button) view.findViewById(R.id.careportal_refreshfromnightscout);
+        refreshFromNS.setOnClickListener(this);
+
+        context = getContext();
+
+        boolean nsUploadOnly = SP.getBoolean(R.string.key_ns_upload_only, false);
+        if (nsUploadOnly)
+            refreshFromNS.setVisibility(View.GONE);
+
+        updateGUI();
+        return view;
+    }
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.careportal_refreshfromnightscout:
+                AlertDialog.Builder builder = new AlertDialog.Builder(this.getContext());
+                builder.setTitle(this.getContext().getString(R.string.confirmation));
+                builder.setMessage(this.getContext().getString(R.string.refresheventsfromnightscout) + " ?");
+                builder.setPositiveButton(this.getContext().getString(R.string.ok), new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int id) {
+                        MainApp.getDbHelper().resetCareportalEvents();
+                        Intent restartNSClient = new Intent(Intents.ACTION_RESTART);
+                        MainApp.instance().getApplicationContext().sendBroadcast(restartNSClient);
+                    }
+                });
+                builder.setNegativeButton(this.getContext().getString(R.string.cancel), null);
+                builder.show();
+                break;
+        }
+
+    }
+
+    @Subscribe
+    public void onStatusEvent(final EventCareportalEventChange ev) {
+        updateGUI();
+    }
+
+    @Override
+    protected void updateGUI() {
+        Activity activity = getActivity();
+        if (activity != null)
+            activity.runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    recyclerView.swapAdapter(new RecyclerViewAdapter(MainApp.getDbHelper().getCareportalEventsFromTime(false)), false);
+                }
+            });
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java
index da276af3c2..fbec0a2308 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java
@@ -503,7 +503,7 @@ public class ActionStringHandler {
             return "Last result not available!";
         }
 
-        if (!result.changeRequested) {
+        if (!result.isChangeRequested()) {
             ret += MainApp.sResources.getString(R.string.nochangerequested) + "\n";
         } else if (result.rate == 0 && result.duration == 0) {
             ret += MainApp.sResources.getString(R.string.canceltemp) + "\n";
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/wearintegration/WatchUpdaterService.java b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/wearintegration/WatchUpdaterService.java
index 65b5a2557d..4adec23560 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/wearintegration/WatchUpdaterService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/wearintegration/WatchUpdaterService.java
@@ -523,27 +523,31 @@ public class WatchUpdaterService extends WearableListenerService implements
     private void sendStatus() {
 
         if (googleApiClient.isConnected()) {
-
-            TreatmentsInterface treatmentsInterface = MainApp.getConfigBuilder();
-            treatmentsInterface.updateTotalIOBTreatments();
-            IobTotal bolusIob = treatmentsInterface.getLastCalculationTreatments().round();
-            treatmentsInterface.updateTotalIOBTempBasals();
-            IobTotal basalIob = treatmentsInterface.getLastCalculationTempBasals().round();
-
-            String iobSum = DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob);
-            String iobDetail = "(" + DecimalFormatter.to2Decimal(bolusIob.iob) + "|" + DecimalFormatter.to2Decimal(basalIob.basaliob) + ")";
-            String cobString = generateCOBString();
-            String currentBasal = generateBasalString(treatmentsInterface);
-
-            //bgi
-            String bgiString = "";
             Profile profile = MainApp.getConfigBuilder().getProfile();
+            String status = MainApp.instance().getString(R.string.noprofile);
+            String iobSum, iobDetail, cobString, currentBasal, bgiString;
+            iobSum =  iobDetail = cobString = currentBasal = bgiString = "";
             if(profile!=null) {
+                TreatmentsInterface treatmentsInterface = MainApp.getConfigBuilder();
+                treatmentsInterface.updateTotalIOBTreatments();
+                IobTotal bolusIob = treatmentsInterface.getLastCalculationTreatments().round();
+                treatmentsInterface.updateTotalIOBTempBasals();
+                IobTotal basalIob = treatmentsInterface.getLastCalculationTempBasals().round();
+
+                iobSum = DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob);
+                iobDetail = "(" + DecimalFormatter.to2Decimal(bolusIob.iob) + "|" + DecimalFormatter.to2Decimal(basalIob.basaliob) + ")";
+                cobString = generateCOBString();
+                currentBasal = generateBasalString(treatmentsInterface);
+
+                //bgi
+
+
                 double bgi = -(bolusIob.activity + basalIob.activity) * 5 * profile.getIsf();
                 bgiString = "" + ((bgi >= 0) ? "+" : "") + DecimalFormatter.to1Decimal(bgi);
+
+                status = generateStatusString(profile, currentBasal,iobSum, iobDetail, bgiString);
             }
 
-            String status = generateStatusString(profile, currentBasal,iobSum, iobDetail, bgiString);
 
             //batteries
             int phoneBattery = getBatteryLevel(getApplicationContext());
@@ -637,6 +641,11 @@ public class WatchUpdaterService extends WearableListenerService implements
     private String generateBasalString(TreatmentsInterface treatmentsInterface) {
 
         String basalStringResult;
+
+        Profile profile = MainApp.getConfigBuilder().getProfile();
+        if (profile == null)
+            return "";
+
         TemporaryBasal activeTemp = treatmentsInterface.getTempBasalFromHistory(System.currentTimeMillis());
         if (activeTemp != null) {
             basalStringResult = activeTemp.toStringShort();
@@ -644,7 +653,7 @@ public class WatchUpdaterService extends WearableListenerService implements
             if (SP.getBoolean(R.string.key_danar_visualizeextendedaspercentage, false)) {
                 basalStringResult = "100%";
             } else {
-                basalStringResult = DecimalFormatter.to2Decimal(MainApp.getConfigBuilder().getProfile().getBasal()) + "U/h";
+                basalStringResult = DecimalFormatter.to2Decimal(profile.getBasal()) + "U/h";
             }
         }
         return basalStringResult;
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java b/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
index 04da1cd9a9..b41a1727b3 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
+++ b/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
@@ -32,6 +32,7 @@ import info.nightscout.androidaps.queue.commands.CommandExtendedBolus;
 import info.nightscout.androidaps.queue.commands.CommandLoadEvents;
 import info.nightscout.androidaps.queue.commands.CommandLoadHistory;
 import info.nightscout.androidaps.queue.commands.CommandReadStatus;
+import info.nightscout.androidaps.queue.commands.CommandSMBBolus;
 import info.nightscout.androidaps.queue.commands.CommandSetProfile;
 import info.nightscout.androidaps.queue.commands.CommandTempBasalAbsolute;
 import info.nightscout.androidaps.queue.commands.CommandTempBasalPercent;
@@ -151,30 +152,35 @@ public class CommandQueue {
 
     // returns true if command is queued
     public boolean bolus(DetailedBolusInfo detailedBolusInfo, Callback callback) {
-        if (isRunning(Command.CommandType.BOLUS)) {
+        Command.CommandType type = detailedBolusInfo.isSMB ? Command.CommandType.SMB_BOLUS : Command.CommandType.BOLUS;
+
+        if (isRunning(type)) {
             if (callback != null)
                 callback.result(executingNowError()).run();
             return false;
         }
 
         // remove all unfinished boluses
-        removeAll(Command.CommandType.BOLUS);
+        removeAll(type);
 
         // apply constraints
         detailedBolusInfo.insulin = MainApp.getConfigBuilder().applyBolusConstraints(detailedBolusInfo.insulin);
         detailedBolusInfo.carbs = MainApp.getConfigBuilder().applyCarbsConstraints((int) detailedBolusInfo.carbs);
 
         // add new command to queue
-        add(new CommandBolus(detailedBolusInfo, callback));
+        if (detailedBolusInfo.isSMB) {
+            add(new CommandSMBBolus(detailedBolusInfo, callback));
+        } else {
+            add(new CommandBolus(detailedBolusInfo, callback));
+            // Bring up bolus progress dialog (start here, so the dialog is shown when the bolus is requested,
+            // not when the Bolus command is starting. The command closes the dialog upon completion).
+            showBolusProgressDialog(detailedBolusInfo.insulin, detailedBolusInfo.context);
+            // Notify Wear about upcoming bolus
+            MainApp.bus().post(new EventBolusRequested(detailedBolusInfo.insulin));
+        }
 
         notifyAboutNewCommand();
 
-        // Notify Wear about upcoming bolus
-        MainApp.bus().post(new EventBolusRequested(detailedBolusInfo.insulin));
-
-        // Bring up bolus progress dialog
-        showBolusProgressDialog(detailedBolusInfo.insulin, detailedBolusInfo.context);
-
         return true;
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java b/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java
index d257bd24d0..c5fb9821bc 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.java
@@ -16,6 +16,8 @@ import info.nightscout.androidaps.events.EventPumpStatusChanged;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.Overview.events.EventDismissBolusprogressIfRunning;
+import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
+import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.queue.events.EventQueueChanged;
 import info.nightscout.utils.SP;
 
@@ -52,12 +54,6 @@ public class QueueThread extends Thread {
             while (true) {
                 PumpInterface pump = ConfigBuilderPlugin.getActivePump();
                 long secondsElapsed = (System.currentTimeMillis() - connectionStartTime) / 1000;
-                if (pump.isConnecting()) {
-                    log.debug("QUEUE: connecting " + secondsElapsed);
-                    MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.CONNECTING, (int) secondsElapsed));
-                    SystemClock.sleep(1000);
-                    continue;
-                }
 
                 if (!pump.isConnected() && secondsElapsed > Constants.PUMP_MAX_CONNECTION_TIME_IN_SECONDS) {
                     MainApp.bus().post(new EventDismissBolusprogressIfRunning(null));
@@ -74,19 +70,37 @@ public class QueueThread extends Thread {
                         //write time
                         SP.putLong(R.string.key_btwatchdog_lastbark, System.currentTimeMillis());
                         //toggle BT
+                        pump.stopConnecting();
+                        pump.disconnect("watchdog");
+                        SystemClock.sleep(1000);
                         BluetoothAdapter mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
                         mBluetoothAdapter.disable();
                         SystemClock.sleep(1000);
                         mBluetoothAdapter.enable();
                         SystemClock.sleep(1000);
                         //start over again once after watchdog barked
+                        //Notification notification = new Notification(Notification.OLD_NSCLIENT, "Watchdog", Notification.URGENT);
+                        //MainApp.bus().post(new EventNewNotification(notification));
                         connectionStartTime = lastCommandTime = System.currentTimeMillis();
+                        pump.connect("watchdog");
                     } else {
                         queue.clear();
+                        log.debug("QUEUE: no connection possible");
+                        MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.DISCONNECTING));
+                        pump.disconnect("Queue empty");
+                        MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.DISCONNECTED));
                         return;
                     }
                 }
 
+                if (pump.isConnecting()) {
+                    log.debug("QUEUE: connecting " + secondsElapsed);
+                    MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.CONNECTING, (int) secondsElapsed));
+                    SystemClock.sleep(1000);
+                    continue;
+                }
+
+
                 if (!pump.isConnected()) {
                     log.debug("QUEUE: connect");
                     MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.CONNECTING, (int) secondsElapsed));
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/Command.java b/app/src/main/java/info/nightscout/androidaps/queue/commands/Command.java
index 5129c7983f..8875ff84a8 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/Command.java
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/Command.java
@@ -11,6 +11,7 @@ import info.nightscout.androidaps.queue.Callback;
 public abstract class Command {
     public enum CommandType {
         BOLUS,
+        SMB_BOLUS,
         TEMPBASAL,
         EXTENDEDBOLUS,
         BASALPROFILE,
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSMBBolus.java b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSMBBolus.java
new file mode 100644
index 0000000000..e1b268106a
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSMBBolus.java
@@ -0,0 +1,46 @@
+package info.nightscout.androidaps.queue.commands;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.data.DetailedBolusInfo;
+import info.nightscout.androidaps.data.PumpEnactResult;
+import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
+import info.nightscout.androidaps.plugins.Overview.Dialogs.BolusProgressDialog;
+import info.nightscout.androidaps.plugins.Overview.events.EventDismissBolusprogressIfRunning;
+import info.nightscout.androidaps.queue.Callback;
+import info.nightscout.utils.DecimalFormatter;
+
+/**
+ * Created by mike on 09.11.2017.
+ */
+
+public class CommandSMBBolus extends Command {
+    private static Logger log = LoggerFactory.getLogger(CommandSMBBolus.class);
+    DetailedBolusInfo detailedBolusInfo;
+
+    public CommandSMBBolus(DetailedBolusInfo detailedBolusInfo, Callback callback) {
+        commandType = CommandType.SMB_BOLUS;
+        this.detailedBolusInfo = detailedBolusInfo;
+        this.callback = callback;
+    }
+
+    @Override
+    public void execute() {
+        PumpEnactResult r;
+        if (detailedBolusInfo.deliverAt != 0 && detailedBolusInfo.deliverAt + 60 * 1000L > System.currentTimeMillis())
+            r = ConfigBuilderPlugin.getActivePump().deliverTreatment(detailedBolusInfo);
+        else {
+            r = new PumpEnactResult().enacted(false).success(false).comment("SMB request too old");
+            log.debug("SMB bolus canceled. delivetAt=" + detailedBolusInfo.deliverAt + " now=" + System.currentTimeMillis());
+        }
+
+        if (callback != null)
+            callback.result(r).run();
+    }
+
+    public String status() {
+        return "SMBBOLUS " + DecimalFormatter.to1Decimal(detailedBolusInfo.insulin) + "U";
+    }
+}
diff --git a/app/src/main/java/info/nightscout/utils/NSUpload.java b/app/src/main/java/info/nightscout/utils/NSUpload.java
index 2ec3a57dd6..2f8893aa7b 100644
--- a/app/src/main/java/info/nightscout/utils/NSUpload.java
+++ b/app/src/main/java/info/nightscout/utils/NSUpload.java
@@ -199,17 +199,8 @@ public class NSUpload {
                 apsResult.json().put("timestamp", DateUtil.toISOString(lastRun.lastAPSRun));
                 deviceStatus.suggested = apsResult.json();
 
-                if (lastRun.request instanceof DetermineBasalResultMA) {
-                    DetermineBasalResultMA result = (DetermineBasalResultMA) lastRun.request;
-                    deviceStatus.iob = result.iob.json();
-                    deviceStatus.iob.put("time", DateUtil.toISOString(lastRun.lastAPSRun));
-                }
-
-                if (lastRun.request instanceof DetermineBasalResultAMA) {
-                    DetermineBasalResultAMA result = (DetermineBasalResultAMA) lastRun.request;
-                    deviceStatus.iob = result.iob.json();
-                    deviceStatus.iob.put("time", DateUtil.toISOString(lastRun.lastAPSRun));
-                }
+                deviceStatus.iob = lastRun.request.iob.json();
+                deviceStatus.iob.put("time", DateUtil.toISOString(lastRun.lastAPSRun));
 
                 if (lastRun.setByPump != null && lastRun.setByPump.enacted) { // enacted
                     deviceStatus.enacted = lastRun.request.json();
diff --git a/app/src/main/res/layout/overview_fragment.xml b/app/src/main/res/layout/overview_fragment.xml
index 158fd6b9b5..10c89254e9 100644
--- a/app/src/main/res/layout/overview_fragment.xml
+++ b/app/src/main/res/layout/overview_fragment.xml
@@ -270,6 +270,7 @@
                         app:buttonTint="@color/basal" />
 
                     <TextView
+                        android:id="@+id/overview_showbasals_label"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
@@ -286,6 +287,7 @@
                         app:buttonTint="@color/iob" />
 
                     <TextView
+                        android:id="@+id/overview_showiob_label"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
@@ -294,7 +296,6 @@
                         android:textColor="@color/iob"
                         android:textStyle="bold" />
 
-
                     <CheckBox
                         android:id="@+id/overview_showcob"
                         android:layout_width="wrap_content"
@@ -303,6 +304,7 @@
                         app:buttonTint="@color/cob" />
 
                     <TextView
+                        android:id="@+id/overview_showcob_label"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
@@ -319,6 +321,7 @@
                         app:buttonTint="@color/deviations" />
 
                     <TextView
+                        android:id="@+id/overview_showdeviations_label"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
@@ -334,6 +337,7 @@
                         android:layout_gravity="center" />
 
                     <TextView
+                        android:id="@+id/overview_showratios_label"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/overview_fragment_nsclient.xml b/app/src/main/res/layout/overview_fragment_nsclient.xml
index bf38114595..bfec8cd179 100644
--- a/app/src/main/res/layout/overview_fragment_nsclient.xml
+++ b/app/src/main/res/layout/overview_fragment_nsclient.xml
@@ -479,7 +479,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    app:buttonTint="@color/prediction" />
+                    android:buttonTint="@color/prediction" />
 
                 <TextView
                     android:id="@+id/overview_showprediction_label"
@@ -496,9 +496,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    app:buttonTint="@color/basal" />
+                    android:buttonTint="@color/basal" />
 
                 <TextView
+                    android:id="@+id/overview_showbasals_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
@@ -512,9 +513,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    app:buttonTint="@color/iob" />
+                    android:buttonTint="@color/iob" />
 
                 <TextView
+                    android:id="@+id/overview_showiob_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
@@ -529,9 +531,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    app:buttonTint="@color/cob" />
+                    android:buttonTint="@color/cob" />
 
                 <TextView
+                    android:id="@+id/overview_showcob_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
@@ -545,9 +548,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    app:buttonTint="@color/deviations" />
+                    android:buttonTint="@color/deviations" />
 
                 <TextView
+                    android:id="@+id/overview_showdeviations_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
@@ -563,6 +567,7 @@
                     android:layout_gravity="center" />
 
                 <TextView
+                    android:id="@+id/overview_showratios_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
diff --git a/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml b/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
index 50fe0fc4f3..0b66f79ab2 100644
--- a/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
+++ b/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
@@ -563,7 +563,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
-                        app:buttonTint="@color/prediction" />
+                        android:buttonTint="@color/prediction" />
 
                     <TextView
                         android:id="@+id/overview_showprediction_label"
@@ -580,9 +580,10 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
-                        app:buttonTint="@color/basal" />
+                        android:buttonTint="@color/basal" />
 
                     <TextView
+                        android:id="@+id/overview_showbasals_label"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
@@ -596,9 +597,10 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
-                        app:buttonTint="@color/iob" />
+                        android:buttonTint="@color/iob" />
 
                     <TextView
+                        android:id="@+id/overview_showiob_label"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
@@ -613,9 +615,10 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
-                        app:buttonTint="@color/cob" />
+                        android:buttonTint="@color/cob" />
 
                     <TextView
+                        android:id="@+id/overview_showcob_label"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
@@ -629,9 +632,10 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
-                        app:buttonTint="@color/deviations" />
+                        android:buttonTint="@color/deviations" />
 
                     <TextView
+                        android:id="@+id/overview_showdeviations_label"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
@@ -647,6 +651,7 @@
                         android:layout_gravity="center" />
 
                     <TextView
+                        android:id="@+id/overview_showratios_label"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/overview_fragment_smallheight.xml b/app/src/main/res/layout/overview_fragment_smallheight.xml
index 42c335d924..019b5740d6 100644
--- a/app/src/main/res/layout/overview_fragment_smallheight.xml
+++ b/app/src/main/res/layout/overview_fragment_smallheight.xml
@@ -245,7 +245,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    app:buttonTint="@color/prediction" />
+                    android:buttonTint="@color/prediction" />
 
                 <TextView
                     android:id="@+id/overview_showprediction_label"
@@ -262,9 +262,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    app:buttonTint="@color/basal" />
+                    android:buttonTint="@color/basal" />
 
                 <TextView
+                    android:id="@+id/overview_showbasals_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
@@ -278,9 +279,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    app:buttonTint="@color/iob" />
+                    android:buttonTint="@color/iob" />
 
                 <TextView
+                    android:id="@+id/overview_showiob_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
@@ -295,9 +297,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    app:buttonTint="@color/cob" />
+                    android:buttonTint="@color/cob" />
 
                 <TextView
+                    android:id="@+id/overview_showcob_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
@@ -311,9 +314,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    app:buttonTint="@color/deviations" />
+                    android:buttonTint="@color/deviations" />
 
                 <TextView
+                    android:id="@+id/overview_showdeviations_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
@@ -329,6 +333,7 @@
                     android:layout_gravity="center" />
 
                 <TextView
+                    android:id="@+id/overview_showratios_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
diff --git a/app/src/main/res/layout/treatments_careportal_fragment.xml b/app/src/main/res/layout/treatments_careportal_fragment.xml
new file mode 100644
index 0000000000..710afed7bb
--- /dev/null
+++ b/app/src/main/res/layout/treatments_careportal_fragment.xml
@@ -0,0 +1,28 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="info.nightscout.androidaps.plugins.Treatments.fragments.TreatmentsCareportalFragment">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <Button
+            android:id="@+id/careportal_refreshfromnightscout"
+            style="?android:attr/buttonStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:text="@string/refresheventsfromnightscout" />
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/careportal_recyclerview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+        </android.support.v7.widget.RecyclerView>
+    </LinearLayout>
+
+</FrameLayout>
diff --git a/app/src/main/res/layout/treatments_careportal_item.xml b/app/src/main/res/layout/treatments_careportal_item.xml
new file mode 100644
index 0000000000..9f688d2438
--- /dev/null
+++ b/app/src/main/res/layout/treatments_careportal_item.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/careportal_cardview"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    card_view:cardBackgroundColor="?android:colorBackground">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:baselineAligned="true"
+            android:orientation="horizontal">
+
+
+            <com.joanzapata.iconify.widget.IconTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:gravity="center_vertical|right"
+                android:paddingLeft="10dp"
+                android:paddingRight="5dp"
+                android:text="{fa-clock-o}" />
+
+            <TextView
+                android:id="@+id/careportal_date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingRight="10dp"
+                android:text="1.1.2000 18:00"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+
+            <TextView
+                android:id="@+id/careportal_type"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+                android:paddingRight="10dp"
+                android:text=""
+                android:textStyle="bold" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="10dp"
+                android:layout_weight="1"
+                android:text="" />
+
+            <TextView
+                android:id="@+id/ns_sign"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="10dp"
+                android:text="NS"
+                android:textColor="@color/colorSetTempButton" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/careportal_note"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:text="Activity" />
+
+            <TextView
+                android:id="@+id/careportal_remove"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="10dp"
+                android:text="@string/overview_quickwizard_item_remove_button"
+                android:textAlignment="viewEnd"
+                android:textColor="@android:color/holo_orange_light" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="2dip"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="5dp"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="5dp"
+            android:layout_marginTop="5dp"
+            android:background="@color/listdelimiter" />
+
+    </LinearLayout>
+
+</android.support.v7.widget.CardView>
diff --git a/app/src/main/res/layout/treatments_fragment.xml b/app/src/main/res/layout/treatments_fragment.xml
index e7b33aee51..ec4421708c 100644
--- a/app/src/main/res/layout/treatments_fragment.xml
+++ b/app/src/main/res/layout/treatments_fragment.xml
@@ -71,6 +71,16 @@
                 android:paddingRight="5dp"
                 android:text="@string/profileswitch" />
 
+            <TextView
+                android:id="@+id/treatments_careportal"
+                android:layout_width="wrap_content"
+                android:layout_height="30dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical|center_horizontal"
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp"
+                android:text="@string/careportal" />
+
         </com.google.android.flexbox.FlexboxLayout>
 
         <FrameLayout
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 312b02b69a..5839ae79ce 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -445,7 +445,6 @@
     <string name="openapsama_bolussnooze_dia_divisor_summary">По подразбиране: 2\nBolus snooze се активира след като поставите болус за основно хранене, така Loop няма да пуснка/намаля базалите веднага след като сте се хранили. Примерът тук е с 2; така при 3 часа DIA това ще означава че bolus snooze ще бъде внимателно изместен 1.5 часа (3DIA/2).</string>
     <string name="openapsama_min_5m_carbimpact_summary">По подразбиране: 3.0\nТова е настройка на количеството на покачване на КЗ при усвояване на въглехидратите за всеки 5 минути. По подразбиране 3мг/дл/5мин. Това се отразява на това колко бързо се усвояват COB според алгоритъма, и как това се отразява в предвиждането на КЗ, когато тя не се покачва или пада с различен темп от очакваното.</string>
     <string name="openapsama_link_to_preferncejson_doc_txt">Внимание! Обикновено Вие не трябва да променяте тези стойности. Моля НАТИСНЕТЕ ТУК, прочетете текста и бъдете сигурни, че го РАЗБИРАТЕ преди да направите каквито и да е промени!</string>
-    <string name="openapsama_link_to_preferncejson_doc">http://openaps.readthedocs.io/en/latest/docs/walkthrough/phase-3/beyond-low-glucose-suspend.html</string>
     <string name="error_only_numeric_digits_allowed">Позволени са само числа</string>
     <string name="error_only_numeric_digits_range_allowed" formatted="false">Позволени са числа между %1$s - %2$s</string>
     <string name="error_field_must_not_be_empty">Полето не може  да бъде празно</string>
@@ -677,4 +676,64 @@
     <string name="wear_settings">Настройки на часовник</string>
     <string name="wearcontrol_summary">Задаване временни цели и въвеждане Лечения от часовник Android wear</string>
     <string name="wearcontrol_title">Контролиране от часовник</string>
+    <string name="closedmodeenabled">Closed Loop е позволен</string>
+    <string name="combo_activity_reading_pump_history">Чете историята на помпата</string>
+    <string name="combo_activity_setting_basal_profile">Настройва базалният профил</string>
+    <string name="combo_error_bolus_recovery_progress">Опитва се да възстанови връзката</string>
+    <string name="combo_error_bolus_verification_failed">Доставянето на болуса и проверката на историята на помпата са неуспешни, моля, проверете помпата и ако е доставен болус го добавете като запис през Careportal</string>
+    <string name="customapp">Модифицирано приложение за изтегляне</string>
+    <string name="danar_setbasalstep001">Задайте стъпка на базала 0.01 Е/ч</string>
+    <string name="DexcomG5">Dexcom G5 приложение (модифицирано)</string>
+    <string name="dexcomg5_nsupload_title">Качвай данните за КЗ в NS</string>
+    <string name="dexcomg5_xdripupload_summary">В xDrip+ изберете 640g/Eversense за източник на данни</string>
+    <string name="dexcomg5_xdripupload_title">Изпращай данни за КЗ към xDrip+</string>
+    <string name="enable_missed_bg_readings_alert">Аларма при липса на данни за КЗ</string>
+    <string name="enable_pump_unreachable_alert">Аларма при недостъпна помпа</string>
+    <string name="executingrightnow">Командата се изпълнява в момента</string>
+    <string name="extendedbolusdeliveryerror">Грешка при доставяне на удължен болус</string>
+    <string name="food">Храна</string>
+    <string name="hasbgdata">Има данни за КЗ от избрания източник</string>
+    <string name="info">ИНФО</string>
+    <string name="localalertsettings_title">Локални аларми</string>
+    <string name="loopenabled">Loop разрешен</string>
+    <string name="maxiobset">Максимален IOB е зададен правилно</string>
+    <string name="minimalbasalvaluereplaced">Базалната стойност е заместена от минимално подържаната</string>
+    <string name="missed_bg_readings">Липсват данни за КЗ</string>
+    <string name="negativeonly">Само отрицателни</string>
+    <string name="no">Не</string>
+    <string name="none"><![CDATA[<празно>]]></string>
+    <string name="nsclientbg">КЗ от NS</string>
+    <string name="nsclienthaswritepermission">NSClient има права за запис</string>
+    <string name="overview_editquickwizard_usebasaliob">Калкулиране на базален IOB</string>
+    <string name="overview_editquickwizard_usebg">Калкулиране на КЗ</string>
+    <string name="overview_editquickwizard_usebolusiob">Калкулиране на Болус IOB</string>
+    <string name="overview_editquickwizard_usecob">Калкулиране на COB</string>
+    <string name="overview_editquickwizard_usesuperbolus">Калкулиране суперболус</string>
+    <string name="overview_editquickwizard_usetemptarget">Калкулиране на временни цели</string>
+    <string name="overview_editquickwizard_usetrend">Калкулиране на тенденция КЗ</string>
+    <string name="positiveonly">Само положителни</string>
+    <string name="processinghistory">Обработва се събитие</string>
+    <string name="pump_unreachable">Помпата е недостъпна</string>
+    <string name="pump_unreachable_threshold">Лимит за недостъпна помпа [мин]</string>
+    <string name="pumpdrivercorrected">Драйверът за помпата е коригиран</string>
+    <string name="remaininsulinalert">Оставащ инсулин</string>
+    <string name="startingbolus">Стартира доставка на болус</string>
+    <string name="unsupportedfirmware">Неподдържан фърмуер на помпата</string>
+    <string name="urgent_alarm">Спешна аларма</string>
+    <string name="waitingforestimatedbolusend" formatted="false">Очаква края на болуса. Остават %d сек.</string>
+    <string name="wear_detailed_delta_summary">Показвай делта с още един десетичен знак</string>
+    <string name="wear_detailed_delta_title">Показвай подробна делта</string>
+    <string name="yes">Да</string>
+    <string name="zerovalueinprofile" formatted="false">Невалиден профил: %s</string>
+    <string name="shortenergy">En</string>
+    <string name="raise_notifications_as_android_notifications">Използвай системни известия за аларми и съобщения</string>
+    <string name="combo_warning">Внимание</string>
+    <string name="combo_tdd_minimum" formatted="false">Минимум: %3.1f U</string>
+    <string name="combo_tdd_maximum" formatted="false">Максимум: %3.1f U</string>
+    <string name="combo_tdd_average" formatted="false">Средно: %3.1f U</string>
+    <string name="combo_reservoir_normal">Нормално</string>
+    <string name="combo_reservoir_low">Ниско</string>
+    <string name="combo_reservoir_level_insufficient_for_bolus">Няма достатъчно инсулин в резервоара</string>
+    <string name="combo_reservoir_empty">Празен</string>
+    <string name="combo_refresh">Обнови</string>
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 751d559130..8e8d09f692 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -96,7 +96,7 @@
     <string name="objectives_gate_label_string">Splnit:</string>
     <string name="objectives_objective_label_string">Cíl:</string>
     <string name="ok">OK</string>
-    <string name="openapsma_currenttemp_label">Součaný bazál</string>
+    <string name="openapsma_currenttemp_label">Současný bazál</string>
     <string name="openapsma_disabled">Modul zakázán</string>
     <string name="openapsma_glucosestatus_label">Vstupní glykémie</string>
     <string name="openapsma_inputparameters_label">Vstupní parametry</string>
@@ -122,7 +122,7 @@
     <string name="rate">Hodnota</string>
     <string name="reason">Zdůvodnění</string>
     <string name="safety">Bezpečnost</string>
-    <string name="danar_useextended_title">Použít prodloužený bolusy pro >200%</string>
+    <string name="danar_useextended_title">Použít prodloužené bolusy pro >200%</string>
     <string name="setextendedbolusquestion">Spustit nový prodloužený bolus:</string>
     <string name="setbasalquestion">Spustit nový dočasný bazál:</string>
     <string name="simpleprofile">Jednoduchý profil</string>
@@ -152,7 +152,7 @@
     <string name="treatmentssafety_maxcarbs_title">Maximální povolené sacharidy [g]</string>
     <string name="treatmentssafety_title">Bezpečnost zadání ošetřeni</string>
     <string name="unsupportedclientver">Nepodporovaná verze NSClient</string>
-    <string name="virtualpump">Virtualní pumpa</string>
+    <string name="virtualpump">Virtuální pumpa</string>
     <string name="pump_basebasalrate_label">Základní hodnota bazálu</string>
     <string name="pump_battery_label">Baterie</string>
     <string name="virtualpump_extendedbolus_label">Prodloužený bolus</string>
@@ -205,8 +205,8 @@
     <string name="devicenotfound">Vybrané zařízení nenalezeno</string>
     <string name="enacted">Provedeno</string>
     <string name="end_user_license_agreement">Licenční ujednání</string>
-    <string name="end_user_license_agreement_i_understand">ROZUMÍM A PORVZUJI</string>
-    <string name="hoursago">h zpět</string>
+    <string name="end_user_license_agreement_i_understand">ROZUMÍM A POTVRZUJI</string>
+    <string name="hoursago">hodin zpět</string>
     <string name="nobtadapter">Nenalezen bluetooth adaptér</string>
     <string name="percent">Procent</string>
     <string name="reloadprofile">Obnovit profil</string>
@@ -266,7 +266,7 @@
     <string name="overview_bolusprogress_goingtodeliver" formatted="false">Podávání %.2fU inzulínu</string>
     <string name="objectives_0_gate">Zkontrolovat, zda jsou glykémie a údaje z pumpy viditelné v Nightscoutu</string>
     <string name="objectives_0_objective">Nastavit vizualizaci a monitoring, analyzovat bazály a koeficienty</string>
-    <string name="objectives_1_gate">Provozovat několik dní otevřenou smyčku a ručně potrvrzovat doporučené dočasné bazály</string>
+    <string name="objectives_1_gate">Provozovat několik dní otevřenou smyčku a ručně potvrzovat doporučené dočasné bazály</string>
     <string name="objectives_1_objective">Začít s otevřenou smyčkou</string>
     <string name="objectives_2_gate">Na základě předchozích zkušeností rozhodnout, jaký je třeba maximální bazál a nastavit ho v pumpě a v aplikaci</string>
     <string name="objectives_2_objective">Porozumět otevřené smyčce a doporučeným dočasným bazálům</string>
@@ -276,7 +276,7 @@
     <string name="objectives_4_objective">Zapnout uzavřenou smyčku, zvyšovat max IOB nad 0 a snižovat cílovou glykémii</string>
     <string name="objectives_5_gate">Jeden týden úspěšného používání s běžným příjmem sacharidů</string>
     <string name="objectives_5_objective">Upravit bazály a koeficinty, když bude potřeba a povolit automatickou detekci citlivosti na inzulín</string>
-    <string name="objectives_6_objective">Povolit další fukce pro běžné používání jako AMA</string>
+    <string name="objectives_6_objective">Povolit další funkce pro běžné používání jako AMA</string>
     <string name="youareonallowedlimit">Dosaženo limitu</string>
     <string name="bolusdelivering" formatted="false">Aplikováno %.2fU</string>
     <string name="smscommunicator_loophasbeendisabled">Smyčka byla zakázána</string>
@@ -326,8 +326,8 @@
     <string name="lowbattery">Nízký stav baterie</string>
     <string name="mgdl">mg/dl</string>
     <string name="mmol">mmol/l</string>
-    <string name="ns_upload_only">Pouze náhráváni do NS (zakázaná synchronizace)</string>
-    <string name="ns_upload_only_summary">Pouze náhrávání dat do NS. Neplatí pro glykémie, dokud není vybraní místní zdroj dat jako xDrip. Neplatí pro profily, pokud se používá NS profil.</string>
+    <string name="ns_upload_only">Pouze nahrávání do NS (zakázaná synchronizace)</string>
+    <string name="ns_upload_only_summary">Pouze nahrávání dat do NS. Neplatí pro glykémie, dokud není vybraný místní zdroj dat jako xDrip. Neplatí pro profily, pokud se používá NS profil.</string>
     <string name="open_settings_on_wear">Otevřít nastavení na hodinkách Wear</string>
     <string name="othersettings_title">Jiné</string>
     <string name="percentagefactor_hint">Hodnota v procentech, kterou bude základní profil vynásoben.</string>
@@ -337,7 +337,7 @@
     <string name="pumpNotInitialized">Pumpa není inicializována</string>
     <string name="pumperror">Chyba pumpy</string>
     <string name="pumpshutdown">Pumpa vypnuta</string>
-    <string name="resend_all_data">Znovu poslat všechny data</string>
+    <string name="resend_all_data">Znovu poslat všechna data</string>
     <string name="reset_db_confirm">Opravdu resetovat všechny databáze</string>
     <string name="target_range">Cílový rozsah:</string>
     <string name="timeshift_hint">Čas v hodinách, o který bude bazál posunutý.</string>
@@ -502,7 +502,7 @@
     <string name="loopmenu">Menu smyčky</string>
     <string name="loopsuspended">Smyčka pozastavena</string>
     <string name="loopsuspendedfor" formatted="false">Pozastaveno (%d min)</string>
-    <string name="needwhitelisting">%s potřebuje vypnout optimalizace baterie pro optimalní výkon</string>
+    <string name="needwhitelisting">%s potřebuje vypnout optimalizace baterie pro optimální výkon</string>
     <string name="pleaseallowpermission">Prosím povolte oprávnění</string>
     <string name="resume">Uvolnit</string>
     <string name="suspendloopfor10h">Pozastavit smyčku na 10 h</string>
@@ -512,7 +512,7 @@
     <string name="disableloop">Zakázat smyčku</string>
     <string name="smscommunicator_loopresumed">Smyčka obnovena</string>
     <string name="smscommunicator_loopsuspended">Smyčka pozastavena</string>
-    <string name="smscommunicator_remotecommandnotallowed">Vzdálení příkaz není povolen</string>
+    <string name="smscommunicator_remotecommandnotallowed">Vzdálený příkaz není povolen</string>
     <string name="smscommunicator_suspendreplywithcode" formatted="false">K pozastavení smyčky na %d minut odpověz SMS s kódem %s</string>
     <string name="smscommunicator_wrongduration">Chybná doba trvání</string>
     <string name="ns_logappstartedevent">Logovat spuštění aplikace do NS</string>
@@ -551,7 +551,7 @@
     <string name="cob">COB</string>
     <string name="configbuilder_sensitivity">Detekce citlivosti</string>
     <string name="cpp_notloadedplugins">Všechny profily nenačteny</string>
-    <string name="cpp_sync_setting_missing">musí být aktivovaný, aby šly poslat hodnoty do pumpy!</string>
+    <string name="cpp_sync_setting_missing">musí být aktivované, aby šly poslat hodnoty do pumpy!</string>
     <string name="cpp_valuesnotstored">Hodnoty nejsou uloženy!</string>
     <string name="danarv2pump">DanaRv2</string>
     <string name="dev">ODCH</string>
@@ -571,8 +571,8 @@
     <string name="ns_alarmoptions">Nastavení alarmů</string>
     <string name="ns_localbroadcasts">Povolit odesílání do ostatních aplikací (jako xDrip)</string>
     <string name="ns_localbroadcasts_title">Povolení odesílaní</string>
-    <string name="ns_noupload">Zakazát nahrávání do NS</string>
-    <string name="ns_noupload_summary">Všechny data odeslaná do NS jsou zahozena. AAPS je připojen k NS, ale nedělá do něj žádné změny.</string>
+    <string name="ns_noupload">Zakázat nahrávání do NS</string>
+    <string name="ns_noupload_summary">Všechna data odeslaná do NS jsou zahozena. AAPS je připojen k NS, ale nedělá do něj žádné změny.</string>
     <string name="nsalarm_high">Vysoká</string>
     <string name="nsalarm_low">Nízká</string>
     <string name="nsalarm_staledata">Zastaralá data</string>
@@ -670,4 +670,113 @@
     <string name="ultrafastactinginsulincomment">Fiasp</string>
     <string name="ultrarapid_oref">Ultra rychlý - Oref</string>
     <string name="waitingforestimatedbolusend" formatted="false">Čekání na konec bolusu. Zbývá %d sek.</string>
+    <string name="objectives_7_objective">Povolit další funkce pro běžné používání jako SMB</string>
+    <string name="openapsama_max_daily_safety_multiplier_summary">Výchozí hodnota: 3 Toto je klíčová hodnota zabezpečení. Říká, že maximánlní nastavitelný bazál je trojnásobkem maximálního denního bazálu. Patrně to nebudete muset měnit, případně si přečtete o tématu \"3x max denní; 4x aktuální\"</string>
+    <string name="openapsama_current_basal_safety_multiplier_summary">Výchozí hodnota: 4 Toto je druhá klíčová hodnota. Říká, že maximální hodnota dočasného bazálu nikdy nebude větší, než čtyřnásobek aktuálního bazálu. Je to proto, aby se lidé nedostali do hodnot nebezpečných bazálu dříve, než pochpí jak OpenAPS pracuje. Znovy vychozí hodnota je 4 a většina lidí ji nidky nebude muset změnit. Pokud nestačí, obvykle je problém někde jinde.</string>
+    <string name="openapsama_autosens_max_summary">Výchozí hodnota: 1.2 Toto je bezpečnostní nastavení pro detekci sensitivity. Říká, že autosens může zvýšit bazály, snížit ISF a snížit cílovou hodnotu glykémie o 20%</string>
+    <string name="openapsama_autosens_min_summary">Výchozí hodnota: 0.7 Toto je bezpečnostní nastavení pro detekci sensitivity. Říká, že autosens může snížit bazály, zvýšit ISF a zvýšit cílovou hodnotu glykémie na 70%</string>
+    <string name="openapsama_autosens_adjusttargets_summary">Výchozí hodnota: zapnuto Toto nastavení říká, že autosens může měnit také cílové hodnoty glykémií.</string>
+    <string name="openapsama_bolussnooze_dia_divisor_summary">Výchozí hodnota: 2 Toto nastavení říká, po jakou část z hodnoty DIA smyčka po bolusu čeká a nereaguje na změny glykémií (zde 3DIA/2 = 1,5h)</string>
+    <string name="openapsama_min_5m_carbimpact_summary">Výchozí hodnota: 3.0 Tato hodnota definuje minimální část strávených sacharidů za každých 5 min. Výchozí hodnota je 3mg/dl/5min. Tato hodnota ovlivňuje výpočet COB</string>
+    <string name="openapsama_link_to_preferncejson_doc_txt">Pozor! Za normálních okolností tyto hodnoty nemusíte měnit. Klikněte ZDE, PŘEČTĚTE si informace a UJISTĚTE se, že jim rozumíte dříve, než je začnete měnit.</string>
+    <string name="openapsama_autosens_period">Interval pro detekci senzitivity [h]</string>
+    <string name="openapsama_autosens_period_summary">Počet hodin do minulosti pro detekci senzitivity</string>
+    <string name="food">Jídlo</string>
+    <string name="shortgramm">g</string>
+    <string name="none"><![CDATA[<prázdný>]]></string>
+    <string name="shortkilojoul">kJ</string>
+    <string name="shortenergy">En</string>
+    <string name="shortprotein">Pr</string>
+    <string name="shortfat">Tuk</string>
+    <string name="executingrightnow">Příkaz je právě prováděn</string>
+    <string name="pumpdrivercorrected">Ovladač pumpy opraven</string>
+    <string name="pump_unreachable">Pumpa nedostupná</string>
+    <string name="missed_bg_readings">Chybějící glykémie</string>
+    <string name="raise_notifications_as_android_notifications">Používat systémové notifikace pro výstrahy a oznámení</string>
+    <string name="localalertsettings_title">Místní výstrahy</string>
+    <string name="enable_missed_bg_readings_alert">Výstraha při nedostupných glykémiích</string>
+    <string name="enable_pump_unreachable_alert">Výstraha při nedostupné pumpě</string>
+    <string name="pump_unreachable_threshold">Limit pro nedostupnost pumpy [min]</string>
+    <string name="urgent_alarm">Urgetní alarm</string>
+    <string name="info">INFO</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="btwatchdog_title">Hlídač BT</string>
+    <string name="btwatchdog_summary">Vypne na 1 sek bluetooth v telefonu, pokud se nedaří připojit k pumpě. Může to pomoci u telefonů, které mají problémy s BT</string>
+    <string name="DexcomG5">DexcomG5 aplikace (upravená)</string>
+    <string name="dexcomg5_nsupload_title">Nahrávat data do NS</string>
+    <string name="dexcomg5_upload">Nastavení nahrávání z G5</string>
+    <string name="customapp">Upravená aplikace pro stažení</string>
+    <string name="wear_detailed_delta_title">Zobrazovat detailní změny</string>
+    <string name="wear_detailed_delta_summary">Zobrazovat rozdíl s jedním desetinným místem navíc</string>
+    <string name="unsupportedfirmware">Nepodporovaný firmware v pumpě</string>
+    <string name="dexcomg5_xdripupload_title">Odesílat data do xDrip+</string>
+    <string name="dexcomg5_xdripupload_summary">V xDrip+ vyberte zdroj dat 640g/Eversense</string>
+    <string name="nsclientbg">Glykémie z NS</string>
+    <string name="minimalbasalvaluereplaced">Hodnota bazálu nahrazena minimální možnou</string>
+    <string name="overview_editquickwizard_usebg">Kalkulace  glykémie</string>
+    <string name="overview_editquickwizard_usebolusiob">Kalkulace bolusového IOB</string>
+    <string name="overview_editquickwizard_usebasaliob">Kalkulace bazálního IOB</string>
+    <string name="overview_editquickwizard_usetrend">Kalkulace trendu</string>
+    <string name="overview_editquickwizard_usesuperbolus">Kalkulace superbolusu</string>
+    <string name="yes">Ano</string>
+    <string name="no">No</string>
+    <string name="positiveonly">Pouze kladné</string>
+    <string name="negativeonly">Pouze záporné</string>
+    <string name="overview_editquickwizard_usecob">Kalkulace COB</string>
+    <string name="overview_editquickwizard_usetemptarget">Kalkulace s dočasným cílem</string>
+    <string name="loopenabled">Smyčka povolena</string>
+    <string name="apsselected">APS vybráno</string>
+    <string name="nsclienthaswritepermission">NSClient má povolení k zápisu</string>
+    <string name="closedmodeenabled">Uzavřená smyčka povolena</string>
+    <string name="maxiobset">Maximální IOB nastaveno správně</string>
+    <string name="hasbgdata">Glykémie dostupné z vybraného zdroje</string>
+    <string name="basalprofilenotaligned" formatted="false">Bazální hodnoty nejsou zarovnané na celé hodiny: %s</string>
+    <string name="zerovalueinprofile" formatted="false">Chybný profil: %s</string>
+    <string name="combo_programming_bolus">Programování pumpy pro bolus</string>
+    <string name="combo_refresh">Obnovit</string>
+    <string name="combo_pump_state_label">Stav</string>
+    <string name="combo_pump_activity_label">Aktivita</string>
+    <string name="combo_no_pump_connection" formatted="false">Žádné spojení %d min</string>
+    <string name="combo_tbr_remaining" formatted="false">%d%% (%d min zbývá)</string>
+    <string name="combo_pump_action_initializing">Inicializace</string>
+    <string name="combo_pump_state_disconnected">Odpojeno</string>
+    <string name="combo_pump_state_suspended_due_to_error">Vypnuto díky chybě</string>
+    <string name="combo_pump_state_suspended_by_user">Vypnuto uživatelem</string>
+    <string name="combo_pump_state_running">Beží</string>
+    <string name="combo_pump_action_cancelling_tbr">Rušení dočasného bazálu</string>
+    <string name="combo_pump_action_setting_tbr" formatted="false">Nastavování doč. bazálu (%d%% / %d min)</string>
+    <string name="combo_pump_action_bolusing" formatted="false">Bolus (%.1f U)</string>
+    <string name="combo_pump_action_refreshing">Obnovování</string>
+    <string name="combo_pump_never_connected">Nikdy</string>
+    <string name="combo_pump_unsupported_operation">Požadovaná operace není pumpou podporována</string>
+    <string name="combo_low_suspend_forced_notification">Nebezpečné použití: extended nebo multiwave bolus je aktivní. Pumpa byla vypnuta jen na 6 hodin. Povolené jsou pouze normální bolusy.</string>
+    <string name="combo_force_disabled_notification">Nebezpečné použití: pumpa má nastavený jiný bazální profil než první. Smyčka byla zakázána. Nastavete první profil a znovu načtěte.</string>
+    <string name="bolus_frequency_exceeded">Bolus stejné velikosti už byl během poslední minuty požadován. Jako preventivní ochrana před zdvojeným bolusem byla operace zakázána.</string>
+    <string name="combo_pump_connected_now">Teď</string>
+    <string name="combo_activity_reading_pump_history">Načítání historie pumpy</string>
+    <string name="combo_pump_alerts">Výstrahy</string>
+    <string name="combo_activity_setting_basal_profile">Nastavení bazálního profilu</string>
+    <string name="combo_pump_cartridge_low_warrning">V zásobníku je málo inzulínu</string>
+    <string name="combo_pump_battery_low_warrning">Slabá baterie v pumpě</string>
+    <string name="combo_is_in_error_state" formatted="false">Pumpa hlásí chybu E%d: %s</string>
+    <string name="combo_error_bolus_recovery_progress">Pokouším se obnovit spojení</string>
+    <string name="combo_error_bolus_verification_failed">Provádění bolusu a čtení historie selhalo. Zkontrolujte pumpu a zadejte bolus přes péči</string>
+    <string name="combo_error_no_bolus_delivered">Provádění bolusu selhalo. Zdá se, že žádný bolus nebyl podán. Zkontrolujte pumpu a případně pošlete bolus znovu. Jako bezpečnostní opatření podání bolusu není opakováno.</string>
+    <string name="combo_error_partial_bolus_delivered" formatted="false">Pouze %.2f U z bolusu %.2f bylo podáno díky chybě. Zkontrolujte pumpu a proveďte nápravu.</string>
+    <string name="combo_history">Historie</string>
+    <string name="combo_pump_tbr_cancelled_warrning">Varování o ukončeném dočasném bazálu bylo potvrzeno.</string>
+    <string name="combo_warning">Varování</string>
+    <string name="combo_reservoir_empty">Prázdný</string>
+    <string name="combo_reservoir_low">Nízký</string>
+    <string name="combo_reservoir_normal">Normální</string>
+    <string name="combo_tdd_average" formatted="false">Průměr: %3.1f U</string>
+    <string name="combo_tdd_maximum" formatted="false">Maximum: %3.1f U</string>
+    <string name="combo_tdd_minimum" formatted="false">Minimum: %3.1f U</string>
+    <string name="combo_no_alert_data_note">Pro přečtení historie chyb dlouze stiskněte tlačítko ALERTS. Varování: může to způsobit chybu, že pumpa bude odmítat všechny připojení a je pak vyžadováno stisknutí tlačítka na pumpě pro obnovení komunikace.</string>
+    <string name="combo_notification_check_time_date">Je vyžadována aktualizace času na pumpě</string>
+    <string name="combo_no_tdd_data_note">Pro přečtení celkových denních dávek dlouze stikněte na pumpě tlačítko TDDS. Varování: může to způsobit chybu, že pumpa bude odmítat všechna připojení a je pak vyžadováno stisknutí tlačítka na pumpě pro obnovení komunikace.</string>
+    <string name="combo_read_full_history_warning">Toto načte kompletní historii pumpy a stavy. Všechno v My Data a hodnoty bazálů. Bolusy a dočasné bazály budou přidány do ošetření, pokud neexistují. Může to způsobit duplicity díky nepřesnosti času v pumpě. Nedoporučuje se pokud používáte smyčku a je určeno pouze pro speciální připady. Varování: může to způsobit chybu, že pumpa bude odmítat všechny připojení a je pak vyžadováno stisknutí tlačítka na pumpě pro obnovení komunikace.</string>
+    <string name="combo_read_full_history_confirmation">Opravdu chcete přečíst historii z pumpy a nést důsledky z toho vyplývající?</string>
+    <string name="combo_reservoir_level_insufficient_for_bolus">Nedostatek inzulínu pro takovýto bolus</string>
+    <string name="extendedbolusdeliveryerror">Chyba spuštění extended bolusu</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 33a4b1bed4..265c6c63ac 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -711,9 +711,6 @@
     <string name="combo_pump_activity_label">Aktivität</string>
     <string name="combo_tbr_remaining">%d%% (%d Min. verbleibend)</string>
     <string name="combo_no_pump_connection">Keine Verbindung zur Pumpe seit %d Min.</string>
-    <string name="bolusstopped">Bolusabgabe gestoppt</string>
-    <string name="bolusstopping">Bolusabgabe wird abgebrochen</string>
-    <string name="pump_errors_history">Fehlerprotokol</string>
     <string name="combo_pump_state_label">Status</string>
     <string name="combo_pump_state_disconnected">Keine Verbindung zur Pumpe</string>
     <string name="combo_pump_state_suspended_by_user">Gestoppt (Benutzer)</string>
@@ -727,7 +724,6 @@
     <string name="alert_dialog_storage_permission_text">Bitte starte dein Telefon neu oder starte AndroidAPS in den System-Einstellungen neu. Andernfalls wird AndroidAPS nicht protokolliert (wichtig zum Nachverfolgen und Verifizieren, dass der Algorithmus korrekt funktioniert)</string>
     <string name="pump_tempbasal_label">TBR</string>
     <string name="combo_last_bolus">%.1f IE (%s, %s)</string>
-    <string name="raise_urgent_alarms_as_android_notification">Nutze System-Benachrichtigungen für Alarme</string>
     <string name="bolus_frequency_exceeded">Ein gleich großer Bolus wurde in der letzten Minute angefordert. Dies ist nicht zulässig, um ungewollte Doppelboli zu verhindern und vor eventuellen Bugs zu schützen.</string>
     <string name="combo_activity_reading_pump_history">Historie wird gelesen</string>
     <string name="combo_activity_setting_basal_profile">Basalratenprofil wird aktualisiert</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 7259194dee..1b4f3aa944 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2,7 +2,6 @@
     <string name="treatmentssafety_title">Seguridad tratamientos</string>
     <string name="treatmentssafety_maxbolus_title">Máximo Bolo permitido [U]</string>
     <string name="treatmentssafety_maxcarbs_title">Máximos carbohidratos permitidos [g]</string>
-
     <string name="nav_preferences">Preferencias</string>
     <string name="nav_refreshtreatments">Refrescar tratamientos desde NS</string>
     <string name="nav_backup">Backup</string>
@@ -12,7 +11,6 @@
     <string name="danar_useextended_title">Usar bolos extendidos para&gt; 200%</string>
     <string name="danar_bt_name_title">DanaR dispositivo Bluetooth</string>
     <string name="ns_sync_use_absolute_title">Usar siempre valor basal absoluto</string>
-
     <string name="objectives_objective_label_string">Objetivo:</string>
     <string name="objectives_gate_label_string">Meta:</string>
     <string name="objectives_button_start">Inicio</string>
@@ -39,7 +37,7 @@
     <string name="treatments_newtreatment_insulinamount_label">Insulina [U]</string>
     <string name="treatments_newtreatment_carbsamount_label">Carbohidratos [g]</string>
     <string name="treatments_wizard_bg_label">Glucosa</string>
-    <string name="treatments_wizard_carbs_label">Hidratos Carbono</string>
+    <string name="treatments_wizard_carbs_label">Carbohidratos</string>
     <string name="treatments_wizard_correction_label">Corrección</string>
     <string name="treatments_wizard_unit_label">U</string>
     <string name="treatments_wizard_bolusiob_label">Bolo IOB</string>
@@ -53,7 +51,7 @@
     <string name="pump_reservoir_label">Depósito:</string>
     <string name="virtualpump_resultok">OK</string>
     <string name="virtualpump_sqlerror">Error de SQL</string>
-    <string name="openapsma_lastrun_label">Última ejecución</string>
+    <string name="openapsma_lastrun_label">Última acción</string>
     <string name="openapsma_inputparameters_label">Parámetros de entrada</string>
     <string name="openapsma_glucosestatus_label">Estado de glucosa</string>
     <string name="openapsma_currenttemp_label">Basal temporal actual</string>
@@ -61,7 +59,7 @@
     <string name="openapsma_profile_label">Perfil</string>
     <string name="openapsma_mealdata_label">Datos de comidas</string>
     <string name="result">Resultado</string>
-    <string name="openapsma_noglucosedata">No hay disponibles datos de glucosa</string>
+    <string name="openapsma_noglucosedata">No hay datos disponibles de glucosa</string>
     <string name="openapsma_noprofile">Sin perfil disponible</string>
     <string name="openapsma_nopump">No se dispone de bomba</string>
     <string name="nochangerequested">Ninguna acción requerida</string>
@@ -72,7 +70,6 @@
     <string name="glucose">Glucosa</string>
     <string name="delta">Delta</string>
     <string name="avgdelta">Delta Media</string>
-
     <string name="configbuilder">Config Builder</string>
     <string name="objectives">Objetivos</string>
     <string name="openapsma">OpenAPS MA</string>
@@ -82,18 +79,15 @@
     <string name="treatments">Tratamientos</string>
     <string name="virtualpump">Bomba virtual</string>
     <string name="careportal">Careportal</string>
-
-
     <string name="configbuilder_pump">Bomba</string>
     <string name="configbuilder_treatments">Tratamientos</string>
-    <string name="configbuilder_tempbasals">Temp Basales</string>
+    <string name="configbuilder_tempbasals">Basales temporales</string>
     <string name="configbuilder_profile">Perfil</string>
     <string name="configbuilder_aps">APS</string>
     <string name="configbuilder_general">General</string>
     <string name="days">días</string>
     <string name="objectives_minimalduration">Duración mínima</string>
     <string name="configbuilder_constraints">Restricciones</string>
-
     <string name="loop">Lazo</string>
     <string name="configbuilder_loop">Lazo</string>
     <string name="loop_aps_label">APS</string>
@@ -124,15 +118,14 @@
     <string name="xdrip">xDrip</string>
     <string name="nsclient">NSClient</string>
     <string name="apsmode_title">Modo APS</string>
-
     <string name="closedloop">Lazo cerrado</string>
     <string name="openloop">Lazo abierto</string>
     <string name="openloop_newsuggestion">Nueva propuesta disponible</string>
-    <string name="unsupportedclientver">Versión de NSClient no soportada</string>
+    <string name="unsupportedclientver">Versión de NSClient no apoyada</string>
     <string name="nsclientnotinstalled">NSClient no instalado. Registro perdido!</string>
     <string name="objectives_bgavailableinns">BG disponible en NS</string>
     <string name="objectives_pumpstatusavailableinns">Estado de la bomba disponible en NS</string>
-    <string name="objectives_manualenacts">Aceptados</string>
+    <string name="objectives_manualenacts">Acceptado manualmente</string>
     <string name="loopdisabled">LAZO DESACTIVADO POR RESTRICCIONES</string>
     <string name="cs_lang">Czech</string>
     <string name="en_lang">English</string>
@@ -144,7 +137,7 @@
     <string name="careportal_note">NOTA</string>
     <string name="careportal_question">Pregunta</string>
     <string name="careportal_exercise">Ejercicio</string>
-    <string name="careportal_pumpsitechange">Cambio Lugar Bomba</string>
+    <string name="careportal_pumpsitechange">Cambio Lugar Cánula</string>
     <string name="careportal_cgmsensorinsert">Insertar sensor</string>
     <string name="careportal_cgmsensorstart">Iniciar sensor</string>
     <string name="careportal_insulincartridgechange">Cambio Cartucho insulina</string>
@@ -155,14 +148,13 @@
     <string name="careportal_combobolus">Combo bolo</string>
     <string name="careportal_tempbasalstart">Basal Temporal Inicio</string>
     <string name="careportal_tempbasalend">Basal Temporal Fin</string>
-    <string name="careportal_carbscorrection">Hidratos Carbono Corrección</string>
+    <string name="careportal_carbscorrection">Corrección Carbohidratos</string>
     <string name="careportal_openapsoffline">OpenAPS Offline</string>
-
     <string name="careportal_newnstreatment_eventtype">Tipo de evento</string>
     <string name="careportal_newnstreatment_other">Otro</string>
     <string name="careportal_newnstreatment_meter">Medidor</string>
     <string name="careportal_newnstreatment_sensor">Sensor</string>
-    <string name="careportal_newnstreatment_carbs_label">Hidratos Carbono</string>
+    <string name="careportal_newnstreatment_carbs_label">Carbohidratos</string>
     <string name="careportal_newnstreatment_insulin_label">Insulina</string>
     <string name="careportal_newnstreatment_carbtime_label">Tiempo absorción</string>
     <string name="careportal_newnstreatment_split_label">Dividir</string>
@@ -196,7 +188,6 @@
     <string name="bg_lang">Bulgarian</string>
     <string name="dismiss">DESCARTAR</string>
     <string name="language">Idioma</string>
-
     <string name="danarpump">DanaR</string>
     <string name="connecting">Conectando</string>
     <string name="connected">Conectado</string>
@@ -206,7 +197,7 @@
     <string name="end_user_license_agreement">Acuerdo de licencia de usuario final</string>
     <string name="end_user_license_agreement_text">No deben utilizarse para tomar decisiones médicas. NO HAY GARANTÍA PARA EL PROGRAMA, la extensión permitida por la legislación aplicable. Excepto cuando se indique de otra forma por escrito, los tenedores del copyright y / u otras partes proporcionan el programa \"tal cual\" sin garantía de ningún tipo, ya sea expresa o implícita, incluyendo, pero no limitado a, las garantías implícitas de COMERCIALIZACIÓN E IDONEIDAD PARA UN FIN DETERMINADO . TODO EL RIESGO EN CUANTO A LA CALIDAD Y RENDIMIENTO DEL PROGRAMA ES CON USTED. SI EL PROGRAMA TIENE UN ERROR, asume el coste de cualquier servicio, reparación o corrección.</string>
     <string name="end_user_license_agreement_i_understand">Entiendo y acepto</string>
-    <string name="save">Salvar</string>
+    <string name="save">Guardar</string>
     <string name="nobtadapter">No se encuentra adaptador Bluetooth</string>
     <string name="devicenotfound">El dispositivo seleccionado no se encuentra</string>
     <string name="connectionerror">Error de conexión de la bomba</string>
@@ -215,7 +206,7 @@
     <string name="danar_dailyunits">Unidades diarias</string>
     <string name="pump_lastbolus_label">Último bolo:</string>
     <string name="hoursago">h antes</string>
-    <string name="danar_invalidinput">Datos invalidos</string>
+    <string name="danar_invalidinput">Datos inválidos</string>
     <string name="danar_valuenotsetproperly">Valor no establecido correctamente</string>
     <string name="reloadprofile">Recargar Perfil</string>
     <string name="danar_viewprofile">Ver perfil</string>
@@ -231,8 +222,8 @@
     <string name="smscommunicator_allowednumbers_summary">XXXXXXXXXX +; + YYYYYYYYYY</string>
     <string formatted="false" name="smscommunicator_bolusreplywithcode">Para entregar bolo% .2fU responder con código% s</string>
     <string name="smscommunicator_bolusfailed">Bolo falló</string>
-    <string formatted="false" name="bolusdelivered">Bolo% .2fU entregado con éxito</string>
-    <string formatted="false" name="bolusdelivering">Entregando% .2fU</string>
+    <string formatted="false" name="bolusdelivered">Bolo %.2fU entregado con éxito</string>
+    <string formatted="false" name="bolusdelivering">Entregando %.2fU</string>
     <string name="smscommunicator_remotebolusnotallowed">Bolo remoto no permitido</string>
     <string name="glucosetype_finger">Dedo</string>
     <string name="glucosetype_sensor">Sensor</string>
@@ -274,8 +265,8 @@
     <string name="occlusion">Oclusión</string>
     <string name="overview_bolusprogress_stop">Detener</string>
     <string name="overview_bolusprogress_stoppressed">Parar pulsado</string>
-    <string name="waitingforpumpclicktorefresh">Esperando bomba. Click to refresh.</string>
-    <string formatted="false" name="overview_bolusprogress_goingtodeliver">Va a entregar %.2fU</string>
+    <string name="waitingforpumpclicktorefresh">Esperando bomba. Pulsar para actualizar.</string>
+    <string formatted="false" name="overview_bolusprogress_goingtodeliver">Se entregará % .2fU</string>
     <string name="objectives_0_objective">Configuración de visualización y monitoreo, y el análisis de los basales y ratios</string>
     <string name="objectives_0_gate">Comprobar que los datos de BG están disponibles en Nightscout, y que los datos de la bomba de insulina se están subiendo</string>
     <string name="objectives_1_objective">Empezar con bucle abierto</string>
@@ -294,27 +285,27 @@
     <string name="ko_lang">Korean</string>
     <string name="actions">Acciones</string>
     <string name="correctionbous">Corr</string>
-    <string name="disabledloop">Loop Inactivo</string>
+    <string name="disabledloop">Lazo Inactivo</string>
     <string name="mealbolus">Bolo Comida</string>
-    <string name="openapsma_valueoutofrange">Valor %s fuera de limites</string>
+    <string name="openapsma_valueoutofrange" formatted="false">Valor %s fuera de limites</string>
     <string name="overview_editquickwizard_buttontext">Botón Texto:</string>
-    <string name="overview_editquickwizard_carbs">Carbs:</string>
+    <string name="overview_editquickwizard_carbs">Carbohidratos:</string>
     <string name="overview_editquickwizard_valid">Validar:</string>
     <string name="overview_editquickwizardlistactivity_add">Añadir</string>
     <string name="overview_quickwizard_item_edit_button">Editar</string>
     <string name="overview_quickwizard_item_remove_button">Eliminar</string>
     <string name="quickwizard">Asistente</string>
     <string name="quickwizardsettings">Ajustes asistente</string>
-    <string name="smscommunicator_loophasbeendisabled">Loop se ha desactivado</string>
-    <string name="smscommunicator_loophasbeenenabled">Loop se ha activado</string>
-    <string name="smscommunicator_loopisdisabled">Loop inactivo</string>
-    <string name="smscommunicator_loopisenabled">loop activo</string>
+    <string name="smscommunicator_loophasbeendisabled">Lazo se ha desactivado</string>
+    <string name="smscommunicator_loophasbeenenabled">Lazo se ha activado</string>
+    <string name="smscommunicator_loopisdisabled">Lazo inactivo</string>
+    <string name="smscommunicator_loopisenabled">Lazo activo</string>
     <string name="smscommunicator_tempbasalcanceled">Basal temporal cancelada</string>
     <string name="smscommunicator_tempbasalcancelfailed">Fallo cancelación  basal temporal</string>
     <string name="smscommunicator_tempbasalfailed">Fallo inicio basal temporal</string>
     <string formatted="false" name="smscommunicator_tempbasalset">Basal temporal %.2fU/h para %d min iniciada correctamente</string>
     <string name="smscommunicator_remotecommandsallowed">Permitir comandos SMS remotos</string>
-    <string name="smscommunicator_basalstopreplywithcode">Para parar basal temporal responder con codigo %s</string>
+    <string name="smscommunicator_basalstopreplywithcode" formatted="false">Para parar basal temporal responder con código %s</string>
     <string name="androidaps_start">AndroidAPS iniciado</string>
     <string name="es_lang">Español</string>
     <string name="ns_upload_only">NS solo subida (sinc. inactiva)</string>
@@ -326,26 +317,26 @@
     <string name="smscommunicator_unknowncommand">Comando desconocido o respuesta incorrecta</string>
     <string name="fillwarning">¡Por favor asegurar que la cantidad coincide con la especificación del set de infusión!</string>
     <string formatted="false" name="smscommunicator_basalreplywithcode">Para iniciar basal %.2fU/h responder con código %s</string>
-    <string name="actions_shortname">" "</string>
-    <string name="wear_shortname">" "</string>
-    <string name="virtualpump_shortname">" "</string>
-    <string name="treatments_shortname">" "</string>
-    <string name="temptargetrange_shortname">" "</string>
-    <string name="tempbasals_shortname">" "</string>
-    <string name="smscommunicator_shortname">" "</string>
-    <string name="simpleprofile_shortname">" "</string>
-    <string name="profileviewer_shortname">" "</string>
-    <string name="overview_shortname">" "</string>
-    <string name="objectives_shortname">" "</string>
-    <string name="oaps_shortname">" "</string>
-    <string name="loop_shortname">" "</string>
-    <string name="localprofile_shortname">" "</string>
-    <string name="danarpump_shortname">" "</string>
-    <string name="configbuilder_shortname">" "</string>
-    <string name="circadian_percentage_profile_shortname">" "</string>
-    <string name="careportal_shortname">" "</string>
+    <string name="actions_shortname">"ACC"</string>
+    <string name="wear_shortname">"REL"</string>
+    <string name="virtualpump_shortname">"BombaV"</string>
+    <string name="treatments_shortname">"Trat"</string>
+    <string name="temptargetrange_shortname">"ObjTempAmpl"</string>
+    <string name="tempbasals_shortname">"ObjTemp"</string>
+    <string name="smscommunicator_shortname">"SMS"</string>
+    <string name="simpleprofile_shortname">"PerfSipmple"</string>
+    <string name="profileviewer_shortname">"Perf"</string>
+    <string name="overview_shortname">"General"</string>
+    <string name="objectives_shortname">"Obj"</string>
+    <string name="oaps_shortname">"Oaps"</string>
+    <string name="loop_shortname">"Lazo"</string>
+    <string name="localprofile_shortname">"PerfLoc"</string>
+    <string name="danarpump_shortname">"Dana"</string>
+    <string name="configbuilder_shortname">"Conf"</string>
+    <string name="circadian_percentage_profile_shortname">"CPP"</string>
+    <string name="careportal_shortname">"CP"</string>
     <string name="activity">Actividad</string>
-    <string name="alert_dialog_storage_permission_text">Por favo reinicia el teléfono o AndroidAPS desde ajustes de sistema, sino AndroidAPS no guardara registros (importantes para trazar y verificar que el algoritmo funciona correctamente)</string>
+    <string name="alert_dialog_storage_permission_text">Por favor reinicia el teléfono o AndroidAPS desde ajustes de sistema, sino AndroidAPS no guardará registros (importantes para trazar y verificar que el algoritmo funcione correctamente)</string>
     <string name="array_of_elements">Matriz de %d elementos. Valor actual:</string>
     <string name="basal_rate">Ratio Basal:</string>
     <string name="basalvaluebelowminimum">Valor basal menor del mínimo. Perfil no fijado.</string>
@@ -356,14 +347,14 @@
     <string name="danar_disableeasymode">Inhabilitar EasyUI modo en bomba</string>
     <string name="danar_enableextendedbolus">Habilitar bolos extendidos en bomba</string>
     <string name="danar_switchtouhmode">Cambio de modo de U/d a U/h en bomba</string>
-    <string name="eatingsoon">Comida temprano</string>
+    <string name="eatingsoon">Comer pronto</string>
     <string name="high_mark">Marca ALTA</string>
     <string name="initializing">Iniciando . . .</string>
     <string name="localprofile">Perfil Local</string>
     <string name="long_avgdelta">Media Larga Delta</string>
     <string name="low_mark">Marca BAJO</string>
     <string name="lowbattery">Batería Baja</string>
-    <string name="minago">%dmin antes</string>
+    <string name="minago" formatted="false">%dmin antes</string>
     <string name="openapsama_useautosens">Usar característica AMA autosens</string>
     <string name="openapsma_autosensdata_label">Datos Autosens</string>
     <string name="percentagefactor_hint">Factor porcentual para multiplicar el perfil base</string>
@@ -379,15 +370,428 @@
     <string name="short_avgdelta">Media corta delta</string>
     <string name="sms_bolus">Bolo:</string>
     <string name="sms_lastbg">Último BG:</string>
-    <string name="sms_minago">%dmin antes</string>
+    <string name="sms_minago" formatted="false">%dmin antes</string>
     <string name="smscommunicator_bolusdelivered">Bolo %.2fU enviado correctamente</string>
     <string name="target_range">Rango Objetivo:</string>
     <string name="units">Unidades:</string>
     <string name="error_only_numeric_digits_allowed">Sólo se permiten caracteres numéricos</string>
-    <string name="error_only_numeric_digits_range_allowed">Sólo se permiten dígitos en el rango %1$s - %2$s</string>
+    <string name="error_only_numeric_digits_range_allowed" formatted="false">Sólo se permiten dígitos en el rango %1$s - %2$s</string>
     <string name="error_field_must_not_be_empty">Este campo no puede estar vacío</string>
     <string name="error_phone_not_valid">Número de teléfono inválido</string>
     <string name="waitingforpump">Esperando bomba</string>
     <string name="it_lang">Italian</string>
     <string name="app_name">AndroidAPS</string>
+    <string name="nl_lang">hollandes</string>
+    <string name="el_lang">Griego</string>
+    <string name="ru_lang">Ruso</string>
+    <string name="sv_lang">Sueco</string>
+    <string name="openapsma_maxbasal_title">Max U/h para el perfil base</string>
+    <string name="openapsma_maxiob_title">"Max IOB basal OpenAPs puede emitir "</string>
+    <string name="smscommunicator_calibrationreplywithcode" formatted="false">Para enviar calibracion %.2f responder con código %s</string>
+    <string name="bolusrequested" formatted="false">Entregaré %.2fU</string>
+    <string name="danarprofile_dia_summary">Duración de acitividad de insulina</string>
+    <string name="pump_errors_history">Errores</string>
+    <string name="objectives_7_objective">habilitar funciones adicionales para uso durante el día como SMB</string>
+    <string name="openapsma_valuelimitedto" formatted="false">%.2f limitado a %.\"f</string>
+    <string name="smscommunicator_remotecommandnotallowed">no permitido el mando remoto</string>
+    <string name="smscommunicator_suspendreplywithcode" formatted="false">Para cancelar loop por %d minutos responde con código %s</string>
+    <string name="primefill">Rellenar/Llenar</string>
+    <string name="fillbolus_title">Llenar/Rellenar cantidad de insulina estándar</string>
+    <string name="timeshift_hint">Tiempo en horas en el que el perfil será movido</string>
+    <string name="mgdl">mg/dl</string>
+    <string name="mmol">mmol/l</string>
+    <string name="dia">DIA:</string>
+    <string name="edit_base_basal">Editar Base-Basal:</string>
+    <string name="edit_base_isf">Edidat Base-ISF:</string>
+    <string name="edit_base_ic">Editar Base-IC:</string>
+    <string name="circadian_percentage_profile">CircadianPercentageProfile</string>
+    <string name="wear">Reloj</string>
+    <string name="open_settings_on_wear">Abrir ajustes en reloj</string>
+    <string name="batterydischarged">Batería de la bomba descargada</string>
+    <string name="danarkoreanpump">DanaR Korean</string>
+    <string name="sms_actualbg">BG:</string>
+    <string name="mdi">MDI</string>
+    <string name="MM640g">MM640g</string>
+    <string name="ongoingnotificaction">Avisos permanentes</string>
+    <string name="old_data">DATOS CADUCADOS</string>
+    <string name="openapsama">OpenAPS AMA</string>
+    <string name="openapsma_scriptdebugdata_label">Script debug</string>
+    <string name="refresheventsfromnightscout">Renovar datos desde NS</string>
+    <string name="danar_stats">DanaR Stats</string>
+    <string name="danar_stats_cumulative_tdd">Dosis diaria cumulativa</string>
+    <string name="danar_stats_expweight">"Dosis diaria ampliada exponencialmente "</string>
+    <string name="danar_stats_basalrate">Base</string>
+    <string name="danar_stats_bolus">Bolo</string>
+    <string name="danar_stats_tdd">Dosis diaria</string>
+    <string name="danar_stats_date">Fecha</string>
+    <string name="danar_stats_ratio">Cuota</string>
+    <string name="danar_stats_amount_days"># Días</string>
+    <string name="danar_stats_weight">Peso</string>
+    <string name="danar_stats_warning_Message">Probablemente impreciso usando bolo para llenar/rellenar!</string>
+    <string name="danar_stats_olddata_Message">Datos caducados pro favor pincha RELOAD</string>
+    <string name="danar_stats_tbb">Basal total</string>
+    <string name="danar_stats_tbb2">Basal diaria *2</string>
+    <string name="short_tabtitles">Tab titulo corto</string>
+    <string name="prefs_delta_title">Ajustes Delta</string>
+    <string name="always_use_shortavg">Usa siempre delta media corto en vez de delta simple</string>
+    <string name="always_use_shortavg_summary">Recomendado si los datos de origen no filtrados como xDrip son inestables.</string>
+    <string name="advancedsettings_title">Ajustes avancados</string>
+    <string name="danar_model" formatted="false">Modelo: %02X Protocolo: %02X Codigo: %02X</string>
+    <string name="profile">Perfiles</string>
+    <string name="openapsama_max_daily_safety_multiplier" translatable="false">max_daily_safety_multiplier</string>
+    <string name="openapsama_max_daily_safety_multiplier_summary">"Valor por defecte: 3 Esto es valor de seguridad establecido pos OpenAPS. Limita tu base al máximo de x3 de tu base máxima. No necesitas cambiar esto, pero debes tener en cuenta, que esto se esta discutiento sobre „3 x max diario; 4x actual“ pro razones de seguridad. "</string>
+    <string name="openapsama_current_basal_safety_multiplier" translatable="false">current_basal_safety_multiplier</string>
+    <string name="openapsama_current_basal_safety_multiplier_summary">"Ajuste pro defecto: 4 Esto es la otra mitad de los ajustes de seguridad de OpenAPS y la otra mitad de \"3x max diario, 4x actual\". Esto significa, que tu base no puede ser mas alta que el numero que multiplica tu base. Esto es para evitar que las personas se encuentren en situaciones peligrosas por aumentar mucho la base sin entender el algoritmo del sistema. El ajuste por defecto es x4. La mayoría de las personas nunca tendra que cambiar estos ajustes, si no debe modificar otros ajustes en la terapia. "</string>
+    <string name="openapsama_autosens_max" translatable="false">autosens_max</string>
+    <string name="openapsama_autosens_max_summary">"Ajuste por defecto: 1.2\nEsto es un multilicador para autosens (y pronto autotune) para poner un 20% limite máximo a la cota de autosens ratio, la que determina cuantos ajustes autosens puede hacer a la base, a cuanto puede ajustar ISF y a cuanto puede bajar el objective de glucosa.  "</string>
+    <string name="openapsama_autosens_min" translatable="false">autosens_min</string>
+    <string name="openapsama_autosens_min_summary">Ajuste pro defecto: 0.7\nEl otro lade de limitaciones de seguridad de autosens, limitando a cuanto puede bajar la base y a cuanto puede subir ISF y BG objectivos.</string>
+    <string name="openapsama_autosens_adjusttargets" translatable="false">autosens_adjust_targets</string>
+    <string name="openapsama_autosens_adjusttargets_summary">Ajuste pro defcto: true\nEsto se usa para permitir autosens a ajustar objectivos BG en addicion a ISF y bases.</string>
+    <string name="openapsama_bolussnooze_dia_divisor" translatable="false">bolussnooze_dia_divisor</string>
+    <string name="openapsama_bolussnooze_dia_divisor_summary">Ajuste pro defecto: 2 \nDormir bolo es iniciado después de proveder un bolo para comida, así el loop no interactuará con low temps cuando acabas de comer. El ajuste pro defecto es 2; quiere decir con el DIA de 3 h el bolo será dormido por fases por 1.5 h (3DIA/2).</string>
+    <string name="openapsama_min_5m_carbimpact" translatable="false">5_min_carb_impact</string>
+    <string name="openapsama_min_5m_carbimpact_summary">"Ajustes pro defecto: 3.0\nEsto es un ajuste pro defecto para la absorcion de carbohidratos pro 5 minutos. Por defecto se espera 3mg/dl/5min. Esto afecta la velocidad de reduccion de COB y cuanta absorcion se usa para calcular el BG futuro previsto, si la glucosa diminua mas de lo previsto o aumenta mas de lo previsto. "</string>
+    <string name="openapsama_link_to_preferncejson_doc_txt">"Atención!\nNormalment no tienes que editar los valores a continuacion. Por favor PINCHA AQUI y LEE el texto y PROCURA ENTENDER antes de cambiar alguno de los valores. "</string>
+    <string name="openapsama_link_to_preferncejson_doc">http://openaps.readthedocs.io/en/latest/docs/walkthrough/phase-3/beyond-low-glucose-suspend.html</string>
+    <string name="smscommunicator_invalidphonennumber">numero de telefonp incorrecto</string>
+    <string name="copy_to_clipboard">Copiar al Clipboard</string>
+    <string name="copied_to_clipboard">Copiado al clipboard</string>
+    <string name="nav_show_logcat">mostrar log</string>
+    <string name="overview_calibration">Calibracion</string>
+    <string name="overview_calibration_bg_label">Calibracion</string>
+    <string name="send_calibration" formatted="false">Mandar calibracion %.lf a xDrip?</string>
+    <string name="xdripnotinstalled">xDrip+ no instalado</string>
+    <string name="calibrationsent">Calibracion mandada a xDrip</string>
+    <string name="smscommunicator_remotecalibrationnotallowed">Calibracion remota no admitida</string>
+    <string name="smscommunicator_calibrationsent">Mandar calibracion tiene que ser activada en xDrip.</string>
+    <string name="smscommunicator_calibrationfailed">xDrip no recibe calibraciones</string>
+    <string name="dont_show_again">no mostrar otra vez</string>
+    <string name="pumpsuspendedclicktorefresh">Bomba parada. Pincha para aktualizar</string>
+    <string name="pumpsuspended">bomba parada</string>
+    <string name="gettingpumpstatus">recibir estado de bomba</string>
+    <string name="settingtempbasal">iniciando base temporal</string>
+    <string name="stoppingtempbasal">parando base temporal</string>
+    <string name="settingextendedbolus">iniciando bolo prolongado</string>
+    <string name="stoppingextendedbolus">parando bolo prolongado</string>
+    <string name="updatingbasalrates">actualizando cuota base</string>
+    <string name="disconnecting">Desconectando</string>
+    <string name="executing">Efectuando</string>
+    <string name="virtualpump_settings">Ajustes bomba virtual</string>
+    <string name="virtualpump_uploadstatus_title">Subiendo estado a NS</string>
+    <string name="wrongpassword">Contrasena invalida</string>
+    <string name="settings_password">Contrasena para ajustes</string>
+    <string name="unlock_settings">desbloquear ajustes</string>
+    <string name="approachingdailylimit">llegando al limite de insulina diario</string>
+    <string name="nsclientinternal">NSClient</string>
+    <string name="nsclientinternal_shortname">NSCI</string>
+    <string name="nsclientinternal_url">URL:</string>
+    <string name="nsclientinternal_autoscroll">Autoscroll</string>
+    <string name="restart">Reiniciar</string>
+    <string name="nsclientinternal_title">NSClient</string>
+    <string name="nsclientinternal_url_title">Nightscout URL</string>
+    <string name="nsclientinternal_url_dialogmessage">Indica Nightscout URL</string>
+    <string name="nsclientinternal_secret_title">NS API secret</string>
+    <string name="nsclientinternal_secret_dialogtitle">NS API secret</string>
+    <string name="nsclientinternal_secret_dialogmessage">Indica NS API secret (min 12 chars)</string>
+    <string name="nsclientinternal_devicename_title">Nombre aparato</string>
+    <string name="nsclientinternal_devicename_dialogtitle">Indica nombre aparato</string>
+    <string name="nsclientinternal_devicename_dialogmessage">Se usara para enteredBy field</string>
+    <string name="deliver_now">entregar ahora</string>
+    <string name="clear_queue">borrar cola</string>
+    <string name="show_queue">mostrar cola</string>
+    <string name="queue">Cola:</string>
+    <string name="status">Estado:</string>
+    <string name="paused">Pausado</string>
+    <string name="clearlog">Borrar log</string>
+    <string name="nowritepermission">NSCLIENT no tiene derecho para editar. API secret incorrecto?</string>
+    <string name="wear_settings">Ajustes reloj</string>
+    <string name="wear_detailedIOB_title">mostrar detalles IOB</string>
+    <string name="wear_detailedIOB_summary">Separar IOB en bolo y base en el reloj</string>
+    <string name="nosuccess">sin efecto - por favor controlar en móvil</string>
+    <string name="notavailable">no disponible</string>
+    <string name="patientage">Edad paciente</string>
+    <string name="child">Menor de edad</string>
+    <string name="teenage">Adolescente</string>
+    <string name="adult">Adulto</string>
+    <string name="patientage_summary">Por favor elige edad del paciente para emplear limites de seguridad</string>
+    <string name="Glimp">Glimp</string>
+    <string name="batteryoptimalizationerror">Aparato parece no soportar optimisacion de bateria whitelisting!</string>
+    <string name="pleaseallowpermission">Por favor permita Permission</string>
+    <string name="needwhitelisting" formatted="false">%s necesita optimisacion de bateria whitelisting para funcionar bien</string>
+    <string name="loopsuspended">Loop desactivado</string>
+    <string name="loopsuspendedfor" formatted="false">desactivado (%d m)</string>
+    <string name="loopsuperbolusfor" formatted="false">Superbolus (%d m)</string>
+    <string name="loopmenu">Loop menu</string>
+    <string name="suspendloopfor1h">Desactivar loop por 1h</string>
+    <string name="suspendloopfor2h">Desactivar loop por 2h</string>
+    <string name="suspendloopfor3h">Desactivar loop por 3h</string>
+    <string name="suspendloopfor10h">Desactivar loop por 10 h</string>
+    <string name="disconnectpumpfor30m">Desconectar bomba por 30 min</string>
+    <string name="disconnectpumpfor1h">Desconectar bomba por 1 h</string>
+    <string name="disconnectpumpfor2h">Desconectar bomba por 2 h</string>
+    <string name="disconnectpumpfor3h">Desconectar bomba por 3 h</string>
+    <string name="disconnectpumpfor10h">Desconectar bomba por 10 h</string>
+    <string name="resume">Reiniciar</string>
+    <string name="smscommunicator_wrongduration">duracion incorrecta</string>
+    <string name="smscommunicator_loopsuspended">Loop desactivado</string>
+    <string name="smscommunicator_loopresumed">Loop reiniciado</string>
+    <string name="treatments_wizard_bgtrend_label">Tendencia 15 min</string>
+    <string name="treatments_wizard_cob_label">COB</string>
+    <string name="superbolus">Superbolo</string>
+    <string name="ns_logappstartedevent">Indica app start en NS</string>
+    <string name="restartingapp">Aplicacion existente para aplicar ajustes.</string>
+    <string name="danarv2pump">DanaRv2</string>
+    <string name="configbuilder_insulin">Insulina</string>
+    <string name="fastactinginsulin">Insulina acción rápida</string>
+    <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
+    <string name="ultrafastactinginsulincomment">Fiasp</string>
+    <string name="insulin_shortname">INS</string>
+    <string name="fastactinginsulinprolonged">Insulina acción rápida prolongada</string>
+    <string name="enablesuperbolus">activar superbolo en wizard</string>
+    <string name="enablesuperbolus_summary">Activar función superbolo en wizard. No lo actives hasta que hayas aprendido lo que realmente hace. PUEDE CAUSAR SOBREDOSIS DE INSULINA usandolo sin precaucion!</string>
+    <string name="iob">IOB</string>
+    <string name="cob">COB</string>
+    <string name="predictionshortlabel">PRE</string>
+    <string name="basalshortlabel">BAS</string>
+    <string name="virtualpump_firmware_label">Firmware</string>
+    <string name="danar_bluetooth_status">Estado de bluetooth</string>
+    <string name="nav_about">Sobre</string>
+    <string name="smscommunicator_missingsmspermission">"Falta permitir SMS "</string>
+    <string name="dev">DEV</string>
+    <string name="xdripstatus_settings">xDrip Status (reloj)</string>
+    <string name="xdripstatus">xDrip Statusline (reloj)</string>
+    <string name="xdripstatus_shortname">xds</string>
+    <string name="wear_showbgi_title">Mostrar BGI</string>
+    <string name="wear_showbgi_summary">agregar BGI a status line</string>
+    <string name="ns_noupload">No upload to NS</string>
+    <string name="ns_noupload_summary">Todos los datos mandados a NS son borrados. AAPS esta conectado to NS pero no hay cambios en NS</string>
+    <string name="basal_step">Nivel base</string>
+    <string name="bolus_step">Nivel bolo</string>
+    <string name="extendedbolus">Bolo prolongado</string>
+    <string name="temptarget">"Objectivo temporal "</string>
+    <string name="overview_extendedbolus_cancel_button">cancelar bolo prolongado</string>
+    <string name="careportal_sensorage_label">Edad sensor</string>
+    <string name="careportal_canulaage_label">Edad cánula</string>
+    <string name="careportal_insulinage_label">Edad insulina</string>
+    <string name="hours">horas</string>
+    <string name="overview_newtempbasal_basaltype_label">Tipo base</string>
+    <string name="isfmissing">Falta ISF en perfil. Usando ajuste por defecto.</string>
+    <string name="icmissing">Falta IC en perfil. Usando ajuste por defecto.</string>
+    <string name="basalmissing">Falta base en perfil. Usando ajuste por defecto.</string>
+    <string name="targetmissing">"Falta objectivo en perfil. Usando ajuste por defecto. "</string>
+    <string name="invalidprofile">Perfil invalido !!!</string>
+    <string name="profileswitch">CambioPerfil</string>
+    <string name="careportal_pbage_label">Edad bateria bomba</string>
+    <string name="careportal_pumpbatterychange">Cambio bateria bomba</string>
+    <string name="ns_alarmoptions">Opciones alama</string>
+    <string name="nsalarm_urgenthigh">Urgente alto</string>
+    <string name="nsalarm_high">Alto</string>
+    <string name="nsalarm_low">Bajo</string>
+    <string name="nsalarm_urgentlow">Urgente bajo</string>
+    <string name="nsalarm_summary" formatted="false">Actualmente puesto a %f</string>
+    <string name="nsalarm_staledata">Stale data</string>
+    <string name="nsalarm_urgentstaledata">Urgent stale data</string>
+    <string name="nsalarm_staledatavalue_label">Stale data threshold [min]</string>
+    <string name="nsalarm_urgent_staledatavalue_label">Urgent stale data threshold [min]</string>
+    <string name="openapsama_autosens_period">Interval para autosens [h]</string>
+    <string name="openapsama_autosens_period_summary">Horas en el pasado para detectar sensividad (tiempo de absorcion de carbohidratos no incluidos)</string>
+    <string name="ratio_short">SEN</string>
+    <string name="do_not_track_profile_switch">"Ignora evenos de cambio de perfil "</string>
+    <string name="do_not_track_profile_switch_summary">"Totos los cambios de perfil son ignorados y se usa siempre el perfil actual "</string>
+    <string name="pump">Bomba</string>
+    <string name="openaps">OpenAPS</string>
+    <string name="device">Aparato</string>
+    <string name="uploader">Uploader</string>
+    <string name="configbuilder_sensitivity">Deteccion sensividad</string>
+    <string name="sensitivity_shortname">SENS</string>
+    <string name="sensitivityoref0">Sensitivity Oref0</string>
+    <string name="sensitivityaaps">Sensitivity AAPS</string>
+    <string name="absorptionsettings_title">Ajustes absorcion</string>
+    <string name="absorption_maxtime_title">Tiempo max absorcion comida [h]</string>
+    <string name="absorption_maxtime_summary">Tiempo esperado en el que todos los carbohidratos son absorbados</string>
+    <string name="danar_visualizeextendedaspercentage_title" formatted="false">mostrar bolo prolongado en %</string>
+    <string name="careportal_sensorage_label_short">SAGE</string>
+    <string name="careportal_insulinage_label_short">IAGE</string>
+    <string name="careportal_canulaage_label_short">CAGE</string>
+    <string name="careportal_pbage_label_short">PBAGE</string>
+    <string name="openaps_short">OAPS</string>
+    <string name="uploader_short">UPLD</string>
+    <string name="basal_short">BAS</string>
+    <string name="virtualpump_extendedbolus_label_short">EXT</string>
+    <string name="lock_screen">Pantalle proteccion</string>
+    <string name="lock_screen_short">Cierre</string>
+    <string name="sensitivity_warning">Al activar autosens recuerda editar todos carbohidratos comidos. Si no, sensividad será calculada incorrectamente !!!</string>
+    <string name="sensitivityweightedaverage">Sensitivity WeightedAverage</string>
+    <string name="mdtp_ok">OK</string>
+    <string name="mdtp_cancel">Cancelar</string>
+    <string name="cpp_sync_setting_missing">necesita ser activado para mandar valores a la bomba!</string>
+    <string name="cpp_notloadedplugins">Faltan perfiles!</string>
+    <string name="cpp_valuesnotstored">Valores no guardados!</string>
+    <string name="wear_overviewnotifications">Resumen avisos</string>
+    <string name="wear_overviewnotifications_summary">Mandar resumen de avisos como avisos de confirmacion por reloj.</string>
+    <string name="combopump" translatable="false">Accu-Chek Combo</string>
+    <string name="combopump_shortname" translatable="false">COMBO</string>
+    <string name="ns_localbroadcasts">Activar mensajes a otras aplicaciones (como xDrip).</string>
+    <string name="ns_localbroadcasts_title">Activar mensajes locales.</string>
+    <string name="careportal_activity_label">ACTIVITY Y FEEDBACK</string>
+    <string name="careportal_carbsandbolus_label">CARBS Y BOLUS</string>
+    <string name="careportal_cgm_label">CGM Y OPENAPS</string>
+    <string name="careportal_pump_label">PUMP</string>
+    <string name="overview_newtempbasal_basalabsolute">Valor base [U/h]</string>
+    <string name="careportal_newnstreatment_duration_min_label">Duracion [min]</string>
+    <string name="insulin_oref_peak">IOB Curve Peak Time</string>
+    <string name="insulin_peak_time">Peak Time [min]</string>
+    <string name="free_peak_oref">Free-Peak Oref</string>
+    <string name="rapid_acting_oref">Rapid-Acting Oref</string>
+    <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
+    <string name="dia_too_short" formatted="false">DIA de %s demasiado corto - usando %s!</string>
+    <string name="activate_profile">ACTIVAR PERFIL</string>
+    <string name="date">Fecha</string>
+    <string name="invalid">INVALIDO</string>
+    <string name="waitingforpairing">Esperando para conectar con bomba</string>
+    <string name="pairingok">Coneccion OK</string>
+    <string name="pairingtimedout">Coneccion fuera de tiempo</string>
+    <string name="pairing">CONECTANDO</string>
+    <string name="danars_nodeviceavailable">aparato no enconrado</string>
+    <string name="emptyreservoir">Deposito vacio</string>
+    <string name="bloodsugarmeasurementalert">Alerta de control de BG</string>
+    <string name="remaininsulinalert">Insulina restante en deposito</string>
+    <string name="danarspump">DanaRS</string>
+    <string name="danarspump_shortname">Dana</string>
+    <string name="selectedpump">Bomba sleccionada</string>
+    <string name="pairpump">Conectar bomba nueva</string>
+    <string name="bolusspeed">Velocidad bolo</string>
+    <string name="danar_setbasalstep001">Poner paso base a 0.01 U/h</string>
+    <string name="serialnumber">Numero de serie</string>
+    <string name="careportal_newnstreatment_percentage_label">Porcientos</string>
+    <string name="careportal_newnstreatment_timeshift_label">Cambio de tiepmo</string>
+    <string name="default_temptargets">Ojbectivo temporal por defecto</string>
+    <string name="eatingsoon_duration">duracion comiendopronto</string>
+    <string name="eatingsoon_target">objectivo comiendopronto</string>
+    <string name="activity_duration">duracion actividad</string>
+    <string name="activity_target">objectivo actividad</string>
+    <string name="danar_history_prime">Prime</string>
+    <string name="gettingextendedbolusstatus">recibiendo estado de bolo prolongado</string>
+    <string name="gettingbolusstatus">recibiendo estado bolo</string>
+    <string name="gettingtempbasalstatus">recibiendo estado bolo temporal</string>
+    <string name="gettingpumpsettings">recibiendo ah´justes bomba</string>
+    <string name="gettingpumptime">recibiendo hora bomba</string>
+    <string name="reuse">usar otra vez</string>
+    <string name="wearcontrol_title">Control desde reloj</string>
+    <string name="wearcontrol_summary">editar y emitir abjectivos temp. y tratamientos por reloj</string>
+    <string name="connectiontimedout">Fuera tiempo coneccion</string>
+    <string name="food">comida</string>
+    <string name="shortgramm">g</string>
+    <string name="none"><![CDATA[<none>]]></string>
+    <string name="shortkilojoul">kJ</string>
+    <string name="shortenergy">En</string>
+    <string name="shortprotein">Pr</string>
+    <string name="shortfat">Grasa</string>
+    <string name="active"><![CDATA[<Active>]]></string>
+    <string name="waitingforestimatedbolusend" formatted="false">Esperande terminar bolo. Faltan %d seg.</string>
+    <string name="processinghistory">Processando</string>
+    <string name="startingbolus">"Iniciando emisioin bolo "</string>
+    <string name="executingrightnow">Orden se esta efectuando en este momento</string>
+    <string name="pumpdrivercorrected">control de la bomba corigido</string>
+    <string name="pump_unreachable">bomba no alcanzable</string>
+    <string name="missed_bg_readings">"Falta lectura BG "</string>
+    <string name="raise_notifications_as_android_notifications">Usa avisos del sistema para alarmas y avisos</string>
+    <string name="localalertsettings_title">Alarma local</string>
+    <string name="enable_missed_bg_readings_alert">Alarma si no llegan datos BG</string>
+    <string name="enable_pump_unreachable_alert">Alarma si bomba no es alcanzable</string>
+    <string name="urgent_alarm">Alarma urgente</string>
+    <string name="info">INFO</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="btwatchdog_title">BT Watchdog</string>
+    <string name="btwatchdog_summary">Apaga el bluetooth del móvil por un segundo si no hay coneccion con la bomba. Esto ayuda con algunos moviles con problemas de establecer coneccion bluetooth estable.</string>
+    <string name="DexcomG5">DexcomG5 App (patched)</string>
+    <string name="dexcomg5_nsupload_title">Envias datos BG a NS</string>
+    <string name="dexcomg5_upload">G5 upload ajustes</string>
+    <string name="customapp">APK adaptada para bajar</string>
+    <string name="wear_detailed_delta_title">"mostrar detalles delta "</string>
+    <string name="wear_detailed_delta_summary">mostrar delta con una plaza decimal mas</string>
+    <string name="unsupportedfirmware">firmware de la bomba no apoyada</string>
+    <string name="dexcomg5_xdripupload_title">mandar BG a xDrip</string>
+    <string name="dexcomg5_xdripupload_summary">En xDrip elige 640g/Eversense date source</string>
+    <string name="nsclientbg">NSClient BG</string>
+    <string name="minimalbasalvaluereplaced">Valor base remplazado por valor mínimo</string>
+    <string name="overview_editquickwizard_usebg">Calculacion BG</string>
+    <string name="overview_editquickwizard_usebolusiob">Calculacion bolo IOB</string>
+    <string name="overview_editquickwizard_usebasaliob">Calculacion base IOB</string>
+    <string name="overview_editquickwizard_usetrend">Calculacion tendencia</string>
+    <string name="overview_editquickwizard_usesuperbolus">Calculacion superbolo</string>
+    <string name="yes">Si</string>
+    <string name="no">No</string>
+    <string name="positiveonly">Solo positivo</string>
+    <string name="negativeonly">Solo negativo</string>
+    <string name="overview_editquickwizard_usecob">Calculacion COB</string>
+    <string name="overview_editquickwizard_usetemptarget">Calculacion objectivo temporal</string>
+    <string name="loopenabled">Loop activado</string>
+    <string name="apsselected">APS seleccionado</string>
+    <string name="nsclienthaswritepermission">NSClient tiene permission de escribir</string>
+    <string name="closedmodeenabled">Modo cerrado activado</string>
+    <string name="maxiobset">Máximo IOB puesto correctamente</string>
+    <string name="hasbgdata">BG adquirible del origen seleccionado</string>
+    <string name="basalprofilenotaligned" formatted="false">Valores base no asignados a las horas: %s</string>
+    <string name="zerovalueinprofile" formatted="false">Perfil invalido: %s</string>
+    <string name="combo_programming_bolus">Programando bomba para emitir bolo</string>
+    <string name="combo_refresh">Actualizar</string>
+    <string name="combo_tdds">TDDS</string>
+    <string name="combo_pump_state_label">Estado</string>
+    <string name="combo_pump_activity_label">Actividad</string>
+    <string name="combo_no_pump_connection" formatted="false">Ninguna coneccnion por %d min</string>
+    <string name="combo_tbr_remaining" formatted="false">%d%% (%d min restan)</string>
+    <string name="combo_last_bolus" formatted="false">%.1f U (%s, %s)</string>
+    <string name="combo_pump_action_initializing">Iniciando</string>
+    <string name="combo_pump_state_disconnected">Desconectado</string>
+    <string name="combo_pump_state_suspended_due_to_error">Apagado por error</string>
+    <string name="combo_pump_state_suspended_by_user">Apagado por usario</string>
+    <string name="combo_pump_state_running">Funcionando</string>
+    <string name="combo_pump_action_cancelling_tbr">Cancelando TBR</string>
+    <string name="combo_pump_action_setting_tbr" formatted="false">Poniendo TBR (%d%% / %d min)</string>
+    <string name="combo_pump_action_bolusing" formatted="false">Emitiendo bolo (%.1f U)</string>
+    <string name="combo_pump_action_refreshing">Actualizando</string>
+    <string name="combo_pump_never_connected">Nunca</string>
+    <string name="combo_pump_unsupported_operation">"Acción no disponible en la bomba "</string>
+    <string name="combo_low_suspend_forced_notification">Uso inseguro: bolo prolongado o multiwave activo. Modo Loop ha sido puesto a baja emision para solo 6 horas. Solo bolo normal se puede emitir en modo loop.</string>
+    <string name="combo_force_disabled_notification">"Uso inseguro: la bomba usa base diferente a la primera. El loop ha sido apagado. Elige primero perfil en la bomba y acualiza. "</string>
+    <string name="bolus_frequency_exceeded">Un bolo de mismo valor ha sido dado durante el pasado minuto. Para evitar bolos dobles y asegurarse contra bugs esto no es permitido.</string>
+    <string name="combo_pump_connected_now">Ahora</string>
+    <string name="combo_activity_reading_pump_history">Leiendo historia bomba</string>
+    <string name="combo_pump_alerts">Alarmas</string>
+    <string name="combo_activity_setting_basal_profile">" Activando perfil base "</string>
+    <string name="combo_pump_cartridge_low_warrning">"Nivel del deposito bajo "</string>
+    <string name="combo_pump_battery_low_warrning">Bateria casi agotada</string>
+    <string name="combo_is_in_error_state" formatted="false">La bomba muesta el error E%d: %s</string>
+    <string name="combo_no_alert_data_note">Para leer historial de los errores, pincha unos segundo el boton \"ALARMAS\" ATENCION: esto puede causar un bug. La bomba no vuelve a conectarse - necesitas pulsar un boton en la misma bomba para reiniciarse. Deberias evitar esto.</string>
+    <string name="combo_no_tdd_data_note">Para leer el hisorial TDD de la bomba pulsa el boton TDDS unso segundos. ATENCION: esto puede causar un bug. La bomba no vuelve a conectarse - necesitas pulsar un boton en la misma bomba para reiniciarse. Deberias evitar esto.</string>
+    <string name="combo_tdd_minimum" formatted="false">Mínimo: %3.1f U</string>
+    <string name="combo_tdd_average" formatted="false">Media: %3.1f U</string>
+    <string name="combo_tdd_maximum" formatted="false">Máximo: %3.1f U</string>
+    <string name="combo_reservoir_low">Bajo</string>
+    <string name="combo_reservoir_empty">Vacio</string>
+    <string name="combo_reservoir_normal">Normal</string>
+    <string name="combo_notification_check_time_date">Se necesita actualizar reloj de la bomba</string>
+    <string name="combo_history">Historial</string>
+    <string name="combo_warning">Alerta</string>
+    <string name="combo_read_full_history_warning">"Esto lee todo el historial y estado de la bomba, tus datos, la base. Bolos, basales temporales y tratamientos seran copiados y agregados si no existen ya. Esto puede causar duplicaciones, por que la hora de la bomba no es precisa. Es uso de esto con el loop normal solo deb ser usado en cirumstancisas especiales. Si de todas meneras quieres usar esto pulsa este boton unos segundos otra vez. ADVERTENCIA: esto puede causar un bug. La bomba no vuelve a conectarse - necesitas pulsar un boton en la misma bomba para reiniciarse. Deberias evitar esto.   "</string>
+    <string name="combo_read_full_history_confirmation">"Estas seguro, de que quieres leer todos los datos de la bomba y acceptar las consequencias de esta acción? "</string>
+    <string name="combo_pump_tbr_cancelled_warrning">TBR cancelada, advertencia acceptada</string>
+    <string name="combo_error_no_bolus_delivered">Emision del bolo fallado. Ningún bolo se ha emitido. Para asegurarse, por favor controle la bomba para evitar bolo doble. Para evitar bugs no se reinician bolos automaticamente.</string>
+    <string name="combo_error_partial_bolus_delivered" formatted="false">"Solo %.2f U del bolo mandado de %.2f U ha sido emitido por causa de un error. Por favorn controla la bomba para confirmar y toma acciones apropiadas. "</string>
+    <string name="combo_error_bolus_verification_failed">"Fallo de emitir bolo y de controlar historical de la bomba.Por favor controla manualmente y crea un record en Careportal si el bolo ha sido emitido. "</string>
+    <string name="combo_error_bolus_recovery_progress">Reestablecido coneccion fallada.</string>
+    <string name="combo_reservoir_level_insufficient_for_bolus">"No hay suficiente insulina en el deposito para emitir bolo. "</string>
+    <string name="extendedbolusdeliveryerror">"Error al emitir bolo prolongado. "</string>
+    <string name="pump_unreachable_threshold">bomba no alcanzable treshold [min]</string>
+    <string name="treatments_wizard_tt_label">TT</string>
+    <string name="unsupportednsversion">Versión no acceptada de Nightscout</string>
+    <string name="enableloop">Activar loop</string>
+    <string name="disableloop">Desactivar loop</string>
+    <string name="sms_basal">Base:</string>
+    <string name="tempbasaldeliveryerror">Base temporal no emitida</string>
+    <string name="tempbasal">Base temporal</string>
+    <string name="sms_delta">Delta:</string>
+    <string name="sms_iob">IOB:</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
new file mode 100644
index 0000000000..31cdf9b3b5
--- /dev/null
+++ b/app/src/main/res/values-fr/strings.xml
@@ -0,0 +1,707 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">AndroidAPS</string>
+    <string name="treatmentssafety_title">Traitements de sécurité</string>
+    <string name="treatmentssafety_maxbolus_title">Bolus max. autorisé [U]</string>
+    <string name="treatmentssafety_maxcarbs_title">Glucides max. autorisés [g]</string>
+    <string name="nav_preferences">Préférences</string>
+    <string name="nav_refreshtreatments">Actualiser les données depuis NS</string>
+    <string name="nav_backup">Sauvegarde</string>
+    <string name="nav_test_alert">Alarme test</string>
+    <string name="nav_resetdb">"Réinitialiser les Bases de Données "</string>
+    <string name="reset_db_confirm">Voulez-vous vraiment réinitialiser les bases de données ?</string>
+    <string name="nav_exit">Quitter</string>
+    <string name="danar_useextended_title">Utiliser les bolus étendus à > 200%</string>
+    <string name="danar_bt_name_title">Dispositif Bluetooth DanaR</string>
+    <string name="ns_sync_use_absolute_title">utiliser toujours les valeurs absolues du basal</string>
+    <string name="alert_dialog_storage_permission_text">Rebootez votre smartphone ou redémarrez AndroidAPS depuis les paramètres système sinon AndroidAPS ne sera pas connecté ( important de suivre et vérifier que les algorithmes fonctionnent correctement)!</string>
+    <string name="objectives_objective_label_string">Objectif:</string>
+    <string name="objectives_button_start">Activer</string>
+    <string name="objectives_gate_label_string">Gate :</string>
+    <string name="objectives_button_verify">Vérifier</string>
+    <string name="nsprofileview_units_label">Unités</string>
+    <string name="nsprofileview_dia_label">Durée d’Action</string>
+    <string name="nsprofileview_activeprofile_label">Profil actif</string>
+    <string name="nsprofileview_ic_label">"I:G (Ratio Insuline/Glucides)                       "</string>
+    <string name="nsprofileview_isf_label">"Facteur SI                  "</string>
+    <string name="nsprofileview_basal_label">Basal</string>
+    <string name="nsprofileview_target_label">Cible</string>
+    <string name="treatments_insulin_label_string">Insuline:</string>
+    <string name="noprofileset">PAS DE PROFIL PRÉDÉFINI</string>
+    <string name="treatments_carbs_label_string">Glucides:</string>
+    <string name="treatments_iob_label_string">IR:</string>
+    <string name="sms_iob">IR:</string>
+    <string name="treatments_activity_string">Activité:</string>
+    <string name="treatments_iobtotal_label_string">IR Totale:</string>
+    <string name="treatments_iobactivitytotal_label_string">Activité IR Totale:</string>
+    <string name="tempbasals_realduration_label_string">Dur:</string>
+    <string name="tempbasals_netratio_label_string">Ratio:</string>
+    <string name="tempbasals_netinsulin_label_string">Ins:</string>
+    <string name="tempbasals_iob_label_string">IR:</string>
+    <string name="tempbasals_iobtotal_label_string">IR Totale:</string>
+    <string name="treatments_newtreatment_insulinamount_label">Insuline:</string>
+    <string name="treatments_newtreatment_carbsamount_label">Glucides:</string>
+    <string name="treatments_wizard_bg_label">G</string>
+    <string name="treatments_wizard_tt_label">CT</string>
+    <string name="treatments_wizard_carbs_label">Glucides</string>
+    <string name="treatments_wizard_correction_label">Corr</string>
+    <string name="treatments_wizard_unit_label">U</string>
+    <string name="treatments_wizard_bolusiob_label">Bolus IR</string>
+    <string name="treatments_wizard_total_label">TOTAL</string>
+    <string name="openapsma_run">"Exécuter maintenant "</string>
+    <string name="vitualpump_label">POMPE VIRTUELLE</string>
+    <string name="virtualpump_basebasalrate_label">"Taux du Débit de Base  "</string>
+    <string name="virtualpump_tempbasal_label">Basal Temporaire</string>
+    <string name="virtualpump_extendedbolus_label">Bolus étendu</string>
+    <string name="virtualpump_battery_label">Niveau Batterie</string>
+    <string name="virtualpump_reservoir_label">Niveau Réservoir</string>
+    <string name="virtualpump_resultok">Confirmer</string>
+    <string name="virtualpump_sqlerror">Erreur SQL</string>
+    <string name="openapsma_lastrun_label">Dérnière exécution</string>
+    <string name="openapsma_inputparameters_label">Paramètres de saisie</string>
+    <string name="openapsma_glucosestatus_label">État de la glycémie</string>
+    <string name="openapsma_currenttemp_label">Débit temporaire actuel</string>
+    <string name="openapsma_iobdata_label">Données IR</string>
+    <string name="openapsma_profile_label">Profil</string>
+    <string name="openapsma_mealdata_label">Données repas</string>
+    <string name="result">Résultat</string>
+    <string name="openapsma_noglucosedata">Pas de données glycémiques dispo</string>
+    <string name="openapsma_noprofile">Pas de profil dispo</string>
+    <string name="openapsma_nopump">Pas de pompe dispo</string>
+    <string name="openapsma_request_label">Requête</string>
+    <string name="rate">"Taux "</string>
+    <string name="duration">Durée</string>
+    <string name="reason">Raison</string>
+    <string name="glucose">Glucose</string>
+    <string name="delta">Delta</string>
+    <string name="sms_delta">Delta:</string>
+    <string name="avgdelta">Moyenne</string>
+    <string name="configbuilder">Config Builder</string>
+    <string name="objectives">Objectifs</string>
+    <string name="openapsma">OpenAPS MA</string>
+    <string name="overview">Aperçu</string>
+    <string name="profileviewer">Profil NS</string>
+    <string name="simpleprofile">Profile simple</string>
+    <string name="tempbasal">Basal Tempo</string>
+    <string name="treatments">Traitements</string>
+    <string name="virtualpump">Pompe virtuelle</string>
+    <string name="careportal">Careportal</string>
+    <string name="configbuilder_pump">Pompe</string>
+    <string name="configbuilder_treatments">Traitements</string>
+    <string name="configbuilder_tempbasals">Basaux tempo</string>
+    <string name="configbuilder_profile">Profil</string>
+    <string name="configbuilder_aps">APS</string>
+    <string name="configbuilder_general">Général</string>
+    <string name="days">Jours</string>
+    <string name="objectives_minimalduration">Durée minimale</string>
+    <string name="configbuilder_constraints">Restrictions</string>
+    <string name="loop">Loop</string>
+    <string name="configbuilder_loop">Loop</string>
+    <string name="loop_aps_label">APS</string>
+    <string name="loop_constraintsprocessed_label">Après traitement des restrictions</string>
+    <string name="loop_setbypump_label">"Défini par pompe  "</string>
+    <string name="openapsma_lastenact_label">Dérnière mise en marche</string>
+    <string name="ok">Confirmer</string>
+    <string name="cancel">Annuler</string>
+    <string name="noapsselected">Pas d\'APS séléctionné ou résultat fourni</string>
+    <string name="safety">Sécurité</string>
+    <string name="openapsma_disabled">Plugin désactivé</string>
+    <string name="constraints_violation">Violation des restrictions</string>
+    <string name="treatmentdeliveryerror">Erreur administration bolus</string>
+    <string name="tempbasaldeliveryerror">Erreur administration temporaire</string>
+    <string name="overview_newtempbasal_basalpercent">Valeur Basal [%]</string>
+    <string name="overview_newtempbasal_percent_label">% (100% = current)</string>
+    <string name="setbasalquestion">Acceptez nouveau basal temp</string>
+    <string name="overview_bolus_label">Bolus</string>
+    <string name="overview_calculator_label">Calculateur de Bolus</string>
+    <string name="constraintapllied">Restriction appliquée!</string>
+    <string name="confirmation">Confirmation</string>
+    <string name="entertreatmentquestion">Entrez nouveau traitement</string>
+    <string name="bolus">Bolus</string>
+    <string name="sms_bolus">Bolus:</string>
+    <string name="basal">Basal</string>
+    <string name="sms_basal">Basal:</string>
+    <string name="carbs">Glucides</string>
+    <string name="changeyourinput">Changez vos entrées!</string>
+    <string name="setextendedbolusquestion">Définir un nouveau bolus étendu</string>
+    <string name="configbuilder_bgsource">Source de glycémie</string>
+    <string name="xdrip">xDrip</string>
+    <string name="nsclient">NSClient</string>
+    <string name="apsmode_title">Mode APS</string>
+    <string name="closedloop">Boucle fermée</string>
+    <string name="openloop">Boucle ouverte</string>
+    <string name="disabledloop">"Loop Désactivé "</string>
+    <string name="disableloop">Désactiver Loop</string>
+    <string name="enableloop">Activer Loop</string>
+    <string name="openloop_newsuggestion">"Nouvelle recommendation dispo "</string>
+    <string name="unsupportednsversion">Version Nightscout incompatible</string>
+    <string name="nsclientnotinstalled">NSClient non installé. Enregistrement perdu!</string>
+    <string name="objectives_bgavailableinns">G disponible sur NS</string>
+    <string name="objectives_pumpstatusavailableinns">état pompe non dispo sur NS</string>
+    <string name="objectives_manualenacts">Activation manuelle</string>
+    <string name="loopdisabled">"LOOP DÉSACTIVÉ PAR RÉSTRICTIONS "</string>
+    <string name="cs_lang">Czech</string>
+    <string name="en_lang">English</string>
+    <string name="treatments_wizard_basaliob_label">Basal IR</string>
+    <string name="bolusconstraintapplied">"Réstriction du Bolus appliquée "</string>
+    <string name="carbsconstraintapplied">Réstriction des Glucides appliquée</string>
+    <string name="careportal_bgcheck">Contrôle de Glycémie</string>
+    <string name="careportal_announcement">Notification</string>
+    <string name="careportal_note">Remarque</string>
+    <string name="careportal_exercise">Question</string>
+    <string name="careportal_pumpsitechange">Changement Zone D\'insertion</string>
+    <string name="careportal_cgmsensorinsert">Insertion Capteur CGM</string>
+    <string name="careportal_cgmsensorstart">Début Capteur CGM</string>
+    <string name="careportal_insulincartridgechange">Changement du Réservoir</string>
+    <string name="careportal_profileswitch">Changement de Profile</string>
+    <string name="careportal_snackbolus">"Bolus Goûter "</string>
+    <string name="careportal_mealbolus">Bolus Repas</string>
+    <string name="careportal_correctionbolus">Bolus de correction</string>
+    <string name="careportal_combobolus">"Bolus Combiné "</string>
+    <string name="careportal_tempbasalstart">"Lancer Débit Temporaire "</string>
+    <string name="careportal_tempbasalend">Fin du Débit Temporaire</string>
+    <string name="careportal_carbscorrection">Correction Glucides</string>
+    <string name="careportal_openapsoffline">OpenAPS Offline</string>
+    <string name="careportal_newnstreatment_eventtype">"Type d'événement "</string>
+    <string name="careportal_newnstreatment_other">Autre</string>
+    <string name="careportal_newnstreatment_meter">Lecteur</string>
+    <string name="careportal_newnstreatment_sensor">Capteur</string>
+    <string name="careportal_newnstreatment_carbs_label">Glucides</string>
+    <string name="careportal_newnstreatment_insulin_label">Insuline</string>
+    <string name="careportal_newnstreatment_carbtime_label">Durée glucides</string>
+    <string name="careportal_newnstreatment_split_label">"Diviser "</string>
+    <string name="careportal_newnstreatment_duration_label">Durée</string>
+    <string name="careportal_newnstreatment_percent_label">"Pour cent "</string>
+    <string name="careportal_newnstreatment_absolute_label">Absolu</string>
+    <string name="careportal_newnstreatment_notes_label">Remarques</string>
+    <string name="careportal_newnstreatment_eventtime_label">"Heure de l'événement "</string>
+    <string name="careportal_newnstreatment_profile_label">Profil</string>
+    <string name="careportal_newnstreatment_enteredby_title">Entré par</string>
+    <string name="careportal_newnstreatment_glucosetype">Source de Glycémie</string>
+    <string name="noprofile">Pas de profil téléchargé encore depuis NS</string>
+    <string name="overview_tempbasal_button">Basal Tempo</string>
+    <string name="overview_extendedbolus_button">Bolus étendu</string>
+    <string name="configbuilder_nightscoutversion_label">Version Nightscout:</string>
+    <string name="send">TRANSMETTRE</string>
+    <string name="missing">Manquants</string>
+    <string name="enabled">Activé</string>
+    <string name="visible">Visible</string>
+    <string name="up">Up</string>
+    <string name="exported">Préférences exportées</string>
+    <string name="export_to">Exporter les paramètres au</string>
+    <string name="import_from">Importer les paramètres depuis</string>
+    <string name="setting_imported">Paramètres importés</string>
+    <string name="filenotfound">Fichier introuvable</string>
+    <string name="nav_export">Exporter les paramètres</string>
+    <string name="nav_import">Importer les paramètres</string>
+    <string name="nl_lang">Dutch</string>
+    <string name="de_lang">German</string>
+    <string name="es_lang">Spanish</string>
+    <string name="el_lang">Greek</string>
+    <string name="it_lang">Italian</string>
+    <string name="ru_lang">Russian</string>
+    <string name="sv_lang">Swedish</string>
+    <string name="openapsma_maxbasal_title">"U/hr Max avec laquelle le débit temp pourra être programmé "</string>
+    <string name="openapsma_maxbasal_summary">Cette valeur est appelée basal maximum dans le contexte OpenAPS</string>
+    <string name="openapsma_maxiob_title">Le Basal IR maximum que l\'OpenAPS pourra délivrer [U]</string>
+    <string name="openapsma_maxiob_summary">Cette valeur est appelée Max IOB dans le contexte OpenAPS</string>
+    <string name="bg_lang">Bulgarian</string>
+    <string name="danarpump">DanaR</string>
+    <string name="dismiss">REJETER</string>
+    <string name="language">Langue</string>
+    <string name="connecting">Connection en cours</string>
+    <string name="connected">Connectée</string>
+    <string name="disconnected">Déconnectée</string>
+    <string name="danar_pump_settings">Paramètres pompe DanaR</string>
+    <string name="nightscout">Nightscout</string>
+    <string name="end_user_license_agreement">Contrat de Licence pour Utilisateur Final</string>
+    <string name="end_user_license_agreement_text">MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
+    <string name="end_user_license_agreement_i_understand">JE COMPRENDS ET J\'ACCEPTE LES CONDITIONS DU CONTRAT</string>
+    <string name="save">Sauvegarder</string>
+    <string name="nobtadapter">L\'adaptateur bluetooth est introuvable</string>
+    <string name="devicenotfound">L\'appareil sélectionné est introuvable</string>
+    <string name="connectionerror">Erreur connection pompe</string>
+    <string name="danar_iob_label">IR affichée sur pompe</string>
+    <string name="danar_dailyunits">Unités Journalières</string>
+    <string name="danar_lastbolus">Dernier Bolus</string>
+    <string name="hoursago">h passées</string>
+    <string name="danar_invalidinput">Données saisies invalides</string>
+    <string name="danar_valuenotsetproperly">Valeur n\'est pas reglée correctement</string>
+    <string name="reloadprofile">Actualiser le profil</string>
+    <string name="danar_viewprofile">Consulter le profil</string>
+    <string name="enacted">Activée</string>
+    <string name="comment">Commentaire</string>
+    <string name="percent">Pour cent</string>
+    <string name="absolute">Absolu</string>
+    <string name="canceltemp">Annuler basal tempo</string>
+    <string name="smscommunicator">Communicateur SMS</string>
+    <string name="waitingforpumpresult">Attente de résultat</string>
+    <string name="smscommunicator_allowednumbers">Numéros de tél autorisés</string>
+    <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
+    <string name="smscommunicator_bolusreplywithcode" formatted="false">Administrer bolus %.2fU retour avec un code %s</string>
+    <string name="smscommunicator_calibrationreplywithcode" formatted="false">Envoyer calibrage %.2fU retour avec un code %s</string>
+    <string name="smscommunicator_bolusfailed">Bolus interrompu</string>
+    <string name="bolusdelivered" formatted="false">Bolus %.2fU administré avec succès</string>
+    <string name="bolusrequested" formatted="false">" %.2fU va être administré"</string>
+    <string name="smscommunicator_bolusdelivered" formatted="false">%.2fU de bolus administré avec succès</string>
+    <string name="bolusdelivering" formatted="false">Entrain d\'administrer %.2fU</string>
+    <string name="smscommunicator_remotecommandsallowed">Autoriser les commandes à distance par SMS</string>
+    <string name="smscommunicator_remotebolusnotallowed">Bolus à distance non autorisé</string>
+    <string name="glucosetype_finger">Doigt</string>
+    <string name="glucosetype_sensor">Capteur</string>
+    <string name="manual">Manuel</string>
+    <string name="careportal_temporarytarget">Cible Temporaire</string>
+    <string name="careportal_temporarytargetcancel">Annulation Cible Temporaire</string>
+    <string name="danarprofile">Paramètres du profil DanaR</string>
+    <string name="danarprofile_dia">"Durée d'Action [h] "</string>
+    <string name="danarprofile_dia_summary">Durée d\'Action d\'Insuline</string>
+    <string name="failedupdatebasalprofile">La mise à jour du profil basal a échouée</string>
+    <string name="danar_history">Historique</string>
+    <string name="danar_historyreload">Actualiser</string>
+    <string name="uploading">Téléchargement en cours</string>
+    <string name="danar_ebolus">Bolus e</string>
+    <string name="danar_dsbolus">Bolus DS</string>
+    <string name="danar_debolus">Bolus DE</string>
+    <string name="danar_error">Erreur</string>
+    <string name="danar_refill">Remplir</string>
+    <string name="danar_basalhour">Heure basal</string>
+    <string name="danar_glucose">Glucose</string>
+    <string name="danar_carbohydrate">Glucides</string>
+    <string name="danar_alarm">Alarme</string>
+    <string name="danar_totaluploaded" formatted="false">Total %d des enregistrements téléchargés</string>
+    <string name="danar_sbolus">Bolus S</string>
+    <string name="danar_history_alarm">Alarmes</string>
+    <string name="danar_history_basalhours">Heures Basal</string>
+    <string name="danar_history_bolus">Bolus</string>
+    <string name="danar_history_carbohydrates">Glucides</string>
+    <string name="danar_history_dailyinsulin">Insuline quotidienne</string>
+    <string name="danar_history_errors">Erreurs</string>
+    <string name="danar_history_glucose">Glucose</string>
+    <string name="danar_history_refill">Remplir</string>
+    <string name="danar_history_syspend">Arrêter</string>
+    <string name="danar_password_title">Mot de passe pompe</string>
+    <string name="wrongpumppassword">"Mot de passe pompe incorrect "</string>
+    <string name="pumpbusy">Pompe occupée</string>
+    <string name="overview_bolusprogress_delivered">Délivré</string>
+    <string name="overview_bolusprogress_stoped">Arrêté</string>
+    <string name="occlusion">Occlusion</string>
+    <string name="overview_bolusprogress_stop">Stop</string>
+    <string name="overview_bolusprogress_stoppressed">Boutton Stop Activé</string>
+    <string name="waitingforpump">Attente connection pompe</string>
+    <string name="waitingforpumpclicktorefresh">Attente connection pompe. Cliquez sur Actualiser</string>
+    <string name="overview_bolusprogress_goingtodeliver" formatted="false">%.2fU va être administré</string>
+    <string name="objectives_0_objective">Paramétrez la visualisation et la surveillance des données, analysez les débits de base et les ratios</string>
+    <string name="objectives_0_gate">Vérifiez que la G est disponible sur Nightscout, et les données d’insuline sur pompe ont été téléchargées</string>
+    <string name="objectives_1_objective">Commencez par le système boucle ouverte</string>
+    <string name="objectives_1_gate">Utilisez le système Open Loop pour quelques jours, et activez manuellement plusieurs débits de base tempo</string>
+    <string name="objectives_2_objective">Comprendre votre système boucle ouverte, y compris ses recommandations de débit de base tempo</string>
+    <string name="objectives_2_gate">"Partant de ce constat, décidez quel est le débit de base maximum à choisir, et entrez le dans la pompe et les préférences "</string>
+    <string name="objectives_3_objective">Commencez par utiliser la boucle fermée avec le système Low Glucose Suspend</string>
+    <string name="nochangerequested">Pas de changement demandé</string>
+    <string name="unsupportedclientver">Version Nightscout incompatible</string>
+    <string name="objectives_3_gate">Utiliser le système de boucle fermée avec max IOB = 0 pour quelques jours sans avoir beaucoup d’événements LGS</string>
+    <string name="objectives_4_objective">Ajustez votre système boucle fermée, augmentez la fonction « max IOB » au dela de 0 et diminuez progressivement vos cibles glycémiques</string>
+    <string name="objectives_4_gate">Utiliser pendant quelques jours, et au moins une nuit sans les alarmes d’hypoglycémie, avant la baisse de G</string>
+    <string name="objectives_5_objective">Ajustez les débits de base et les ratios si besoin, ensuite activez « auto-sens »</string>
+    <string name="objectives_5_gate">Une semaine réussie avec des journées en boucle fermée, avec un entrée normale de glucides</string>
+    <string name="objectives_6_objective">Activez d’autres fonctionalités pour l’utilisation journalière, tel que advanced meal assist</string>
+    <string name="youareonallowedlimit">Vous avez atteint la limite maximale</string>
+    <string name="noprofileselected">Aucun profil séléctionné</string>
+    <string name="smscommunicator_loophasbeendisabled">Loop a été désactivé</string>
+    <string name="smscommunicator_loophasbeenenabled">Loop a été désactivé</string>
+    <string name="smscommunicator_loopisdisabled">"Loop est désactivé "</string>
+    <string name="smscommunicator_loopisenabled">Loop est activé</string>
+    <string name="openapsma_valuelimitedto" formatted="false">%.2f limité à %.2f</string>
+    <string name="openapsma_valueoutofrange" formatted="false">La valeur %s est hors limites strictes</string>
+    <string name="smscommunicator_remotebasalnotallowed">Le réglage du basal à distance n\'est pas autorisé</string>
+    <string name="smscommunicator_remotecommandnotallowed">La commande à distance n\'est pas autorisée</string>
+    <string name="smscommunicator_basalreplywithcode" formatted="false">Lancer le basal %.2fU/h retour avec un code %s</string>
+    <string name="smscommunicator_suspendreplywithcode" formatted="false">Suspendre Loop pour %d minutes retour avec un code %s</string>
+    <string name="smscommunicator_tempbasalset" formatted="false">Démarrage réussi pour %.2fU/h de basal tempo pour %d min</string>
+    <string name="smscommunicator_tempbasalfailed">Démarage échoué pour basal tempo</string>
+    <string name="smscommunicator_basalstopreplywithcode" formatted="false">Arrêter basal tempo retour avec un code %s</string>
+    <string name="smscommunicator_tempbasalcanceled">Basal tempo annulé</string>
+    <string name="smscommunicator_tempbasalcancelfailed">Annuler basal tempo échoué</string>
+    <string name="smscommunicator_unknowncommand">"Commande inconnue ou réponse fausse "</string>
+    <string name="quickwizard">Assistant Bolus Rapide</string>
+    <string name="quickwizardsettings">Paramètres assistant bolus rapide</string>
+    <string name="overview_editquickwizard_buttontext">Titre sur la touche:</string>
+    <string name="overview_editquickwizard_carbs">Glucides:</string>
+    <string name="overview_editquickwizard_valid">Valide:</string>
+    <string name="overview_editquickwizardlistactivity_add">Ajouter</string>
+    <string name="overview_quickwizard_item_edit_button">Éditer</string>
+    <string name="overview_quickwizard_item_remove_button">Retirer</string>
+    <string name="mealbolus">Repas</string>
+    <string name="correctionbous">Corr</string>
+    <string name="ko_lang">Coréenne</string>
+    <string name="actions">Actions</string>
+    <string name="androidaps_start">AndroidAPS est lancé</string>
+    <string name="ns_upload_only">Uniquement téléchargement NS (sync désactivée)</string>
+    <string name="ns_upload_only_summary">Uniquement téléchargement NS. Ceci n’est pas efficace pour les SGV à moins qu’une source locale comme xDrip soit sélectionnée. Ceci n’est pas efficace sur les profils lorsque les profils NS sont utilisés</string>
+    <string name="pumpNotInitialized">Pompe non initialisée!</string>
+    <string name="pumpNotInitializedProfileNotSet">Pompe non initialisée, profil non prédéfini</string>
+    <string name="primefill">Amorcer/Remplir</string>
+    <string name="fillwarning">Veillez à ce que la quantité corresponde à la spécification de votre KT!</string>
+    <string name="othersettings_title">Autres</string>
+    <string name="fillbolus_title">Remplir/Amorcer des quantités standard d’insuline</string>
+    <string name="button1">Touche 1</string>
+    <string name="button2">Touche 2</string>
+    <string name="button3">Touche 3</string>
+    <string name="percentagefactor_hint">Le facteur pourcentage avec lequel le profil de base sera multiplié</string>
+    <string name="timeshift_hint">Temps en heures avec lequel le profil sera modifié en round-robin</string>
+    <string name="units">Unités</string>
+    <string name="mgdl">mg/dl</string>
+    <string name="mmol">mmol/l</string>
+    <string name="dia">Durée d\'Action</string>
+    <string name="target_range">Fourchette cible:</string>
+    <string name="edit_base_basal">"Éditer Débit de Base:  "</string>
+    <string name="edit_base_isf">"Éditer Facteur SI de Base:                  "</string>
+    <string name="edit_base_ic">"Éditer I:G de Base:                      "</string>
+    <string name="base_profile_label">Profil de Base:</string>
+    <string name="circadian_percentage_profile">Profil en Pourcentage Circadien</string>
+    <string name="prefs_range_title">Écart de visualisation</string>
+    <string name="prefs_range_summary">Les repères hauts et bas sur les graphiques pour l’apercu et la montre</string>
+    <string name="low_mark">Repère BAS</string>
+    <string name="high_mark">Repère HAUT</string>
+    <string name="wear">Wear</string>
+    <string name="resend_all_data">Retransmettre toutes les données</string>
+    <string name="open_settings_on_wear">Afficher les Paramètres sur la Montre</string>
+    <string name="pumperror">Erreur Pompe</string>
+    <string name="lowbattery">Niveau Batterie Bas</string>
+    <string name="pumpshutdown">Arrêt de la Pompe</string>
+    <string name="batterydischarged">Baterie Pompe déchargée</string>
+    <string name="danarkoreanpump">DanaR Coréenne</string>
+    <string name="basal_rate">Taux du Débit de Base:</string>
+    <string name="profile_set_failed">Réglage du profil de base a échoué</string>
+    <string name="profile_set_ok">Mise à jour du profil de base dans la pompe</string>
+    <string name="danar_disableeasymode">Désactiver le mode Facile UI dans la pompe</string>
+    <string name="danar_enableextendedbolus">Activer les bolus étendus dans la pompe</string>
+    <string name="danar_switchtouhmode">"Modifier le mode U/d au U/h dans la pompe "</string>
+    <string name="basalvaluebelowminimum">Le débit de base est en dessous du minimum. Profil non prédéfini!</string>
+    <string name="sms_actualbg">G:</string>
+    <string name="sms_lastbg">Dernière G</string>
+    <string name="mdi">IQM</string>
+    <string name="MM640g">MM640g</string>
+    <string name="ongoingnotificaction">Notification En Cours</string>
+    <string name="old_data">ANCIENNES DONNÉES</string>
+    <string name="minago" formatted="false">%dmin passées</string>
+    <string name="sms_minago" formatted="false">%dmin passées</string>
+    <string name="localprofile">Profile Local</string>
+    <string name="openapsama">OpenAPS AMA</string>
+    <string name="short_avgdelta">Courte moyenne delta</string>
+    <string name="long_avgdelta">Longue moyenne delta</string>
+    <string name="array_of_elements" formatted="false">Panoplie de %d d\'élements. Valeur réelle</string>
+    <string name="openapsma_autosensdata_label">Données autosens</string>
+    <string name="openapsma_scriptdebugdata_label">Script de débogage</string>
+    <string name="openapsama_useautosens">Utiliser la fonction AMA autosens</string>
+    <string name="refresheventsfromnightscout">Actualiser les événements depuis NS</string>
+    <string name="eatingsoon">Manger Bientôt</string>
+    <string name="activity">Activité</string>
+    <string name="removerecord">Retirer l\'enregistrement:</string>
+    <string name="danar_stats">Dana Stats</string>
+    <string name="danar_stats_cumulative_tdd">DTQ Cumulative</string>
+    <string name="danar_stats_expweight">DTQ avec Pondération Exponentielle</string>
+    <string name="danar_stats_basalrate">Basal</string>
+    <string name="danar_stats_bolus">Bolus</string>
+    <string name="danar_stats_tdd">DTQ</string>
+    <string name="danar_stats_date">Date</string>
+    <string name="danar_stats_ratio">Ratio</string>
+    <string name="danar_stats_amount_days"># Jours</string>
+    <string name="danar_stats_weight">Pondération</string>
+    <string name="danar_stats_warning_Message">Peut-être inexact(e) si les bolus sont utilisés pour l’amorçage et le remplissage!</string>
+    <string name="danar_stats_olddata_Message">Pour les anciennes données appuyez sur Actualiser svp</string>
+    <string name="danar_stats_tbb">Débit de Base Total</string>
+    <string name="danar_stats_tbb2">DBT*2</string>
+    <string name="initializing">En cours d\'initialisation</string>
+    <string name="actions_shortname">ACT</string>
+    <string name="configbuilder_shortname">CONF</string>
+    <string name="loop_shortname">LOOP</string>
+    <string name="simpleprofile_shortname">SP</string>
+    <string name="oaps_shortname">OAPS</string>
+    <string name="temptargetrange_shortname">TT</string>
+    <string name="localprofile_shortname">LP</string>
+    <string name="danarpump_shortname">DANA</string>
+    <string name="circadian_percentage_profile_shortname">CPP</string>
+    <string name="tempbasals_shortname">TB</string>
+    <string name="overview_shortname">HOME</string>
+    <string name="virtualpump_shortname">POMPEV</string>
+    <string name="profileviewer_shortname">PROFILE NS</string>
+    <string name="treatments_shortname">TRAITER</string>
+    <string name="careportal_shortname">CP</string>
+    <string name="objectives_shortname">OBJ</string>
+    <string name="wear_shortname">WEAR</string>
+    <string name="smscommunicator_shortname">SMS</string>
+    <string name="short_tabtitles">Raccourcir les titres des onglets</string>
+    <string name="prefs_delta_title">Paramètres Delta</string>
+    <string name="always_use_shortavg">Toujours utilisez une moyenne (delta) courte au lieu d’une moyenne normale</string>
+    <string name="always_use_shortavg_summary">Utile quand les données provenant de sources non filtrées lorsque xDrip devient bruyant</string>
+    <string name="advancedsettings_title">Paramètres Avancés</string>
+    <string name="danar_model" formatted="false">Modèle: %02X Protocole: %02X Code: %02X</string>
+    <string name="profile">Profil</string>
+    <string name="openapsama_autosens_adjusttargets_summary">Valeur par défaut : true</string>
+    <string name="error_only_numeric_digits_range_allowed">Seuls les chiffres numériques qui se trouvent dans la fourchette %1$s - %2$s sont autorisés</string>
+    <string name="error_field_must_not_be_empty">Le champs ne doit pas être vide</string>
+    <string name="error_phone_not_valid">Num de tél est invalide</string>
+    <string name="smscommunicator_invalidphonennumber">"Num tél du SMS invalide "</string>
+    <string name="copy_to_clipboard">Copier dans le Presse-Papiers</string>
+    <string name="copied_to_clipboard">Copier dans le Presse-Papiers</string>
+    <string name="nav_show_logcat">Afficher le journal</string>
+    <string name="overview_calibration">Étalonnage</string>
+    <string name="overview_calibration_bg_label">Étalonnage</string>
+    <string name="send_calibration" formatted="false">Transmettre l\'étalonnage %.1f à xDrip?</string>
+    <string name="xdripnotinstalled">xDrip+ n\'est pas installé</string>
+    <string name="calibrationsent">Étalonnage envoyé à xDrip</string>
+    <string name="smscommunicator_remotecalibrationnotallowed">L\'étalonnage à distance n\'est pas autorisé</string>
+    <string name="smscommunicator_calibrationsent">"Étalonnage envoyé. La récepetion doit être activée dans xDrip. "</string>
+    <string name="smscommunicator_calibrationfailed">xDrip ne reçoit pas les étalonnages</string>
+    <string name="dont_show_again">Ne plus montrer ce message</string>
+    <string name="pumpsuspendedclicktorefresh">Pompe suspendue.Cliquez pour actualiser le profile</string>
+    <string name="pumpsuspended">Pompe suspendue</string>
+    <string name="gettingpumpstatus">Obtenir l\'état de pompe</string>
+    <string name="settingtempbasal">Définir basal tempo</string>
+    <string name="stoppingtempbasal">Arrêter basal tempo</string>
+    <string name="settingextendedbolus">Définir bolus étendu</string>
+    <string name="stoppingextendedbolus">Arrêter bolus étendu</string>
+    <string name="updatingbasalrates">Mettre à jour les taux de debit de base</string>
+    <string name="disconnecting">Déconnexion en cours</string>
+    <string name="executing">Exécution en cours</string>
+    <string name="virtualpump_settings">"Paramètres pompe virtuelle "</string>
+    <string name="virtualpump_uploadstatus_title">Téléchargement d\'état sur NS</string>
+    <string name="wrongpassword">Mauvais mot de passe</string>
+    <string name="settings_password">Mot de passe pour paramètres</string>
+    <string name="unlock_settings">Déverrouiller</string>
+    <string name="approachingdailylimit">L\'insuline journalière s\'approche de la limite</string>
+    <string name="nsclientinternal">NSClient</string>
+    <string name="nsclientinternal_shortname">NCSI</string>
+    <string name="nsclientinternal_url">URL:</string>
+    <string name="nsclientinternal_autoscroll">Défilement automatique</string>
+    <string name="restart">Redémarrer</string>
+    <string name="nsclientinternal_title">NSClient</string>
+    <string name="nsclientinternal_url_title">URL Nightscout</string>
+    <string name="nsclientinternal_url_dialogmessage">Entrez L’URL Nightscout</string>
+    <string name="nsclientinternal_secret_title">NS API secret</string>
+    <string name="nsclientinternal_secret_dialogtitle">NS API secret</string>
+    <string name="nsclientinternal_secret_dialogmessage">Entrez NS API secret (12 carac. min)</string>
+    <string name="nsclientinternal_devicename_title">Nom de l\'appareil</string>
+    <string name="nsclientinternal_devicename_dialogtitle">Entrez le nom de l\'appareil</string>
+    <string name="nsclientinternal_devicename_dialogmessage">Cela sera utilisé pour le champ \"Entré par\"</string>
+    <string name="deliver_now">Transmettre maintenant</string>
+    <string name="clear_queue">Vider la file d\'attente</string>
+    <string name="show_queue">Afficher la file d\'attente</string>
+    <string name="queue">File d\'attente:</string>
+    <string name="status">État</string>
+    <string name="paused">Interrompu</string>
+    <string name="clearlog">Effacer histo</string>
+    <string name="nowritepermission">NSCLIENT ne possède pas la permission d\'écriture. Mauvais API secret?</string>
+    <string name="wear_settings">Paramètres Wear</string>
+    <string name="wear_detailedIOB_title">Afficher l\'IR détaillée</string>
+    <string name="wear_detailedIOB_summary">Décomposer l’IR dans l\'IR du bolus et basal sur la montre</string>
+    <string name="nosuccess">Sans succès - vérifiez votre téléphone</string>
+    <string name="notavailable">Non disponible</string>
+    <string name="patientage">l\'Age du patient</string>
+    <string name="child">" Enfant"</string>
+    <string name="teenage">Adolescent</string>
+    <string name="adult">Adulte</string>
+    <string name="patientage_summary">Veuillez sélectionner l’âge du patient pour paramétrer les limites de sécurité svp</string>
+    <string name="Glimp">Glimp</string>
+    <string name="batteryoptimalizationerror">Le dispositif n’apparaît pas pour renforcer la liste blanche de l’optimisation de batterie!</string>
+    <string name="pleaseallowpermission">Autorisez l\'accès svp</string>
+    <string name="needwhitelisting">% a besoin de la liste blanche de l’optimisation batterie  pour une bonne performance</string>
+    <string name="loopsuspended">Loop suspendu</string>
+    <string name="loopsuspendedfor" formatted="false">Suspendu (%d m)</string>
+    <string name="loopsuperbolusfor" formatted="false">Superbolus (%d m)</string>
+    <string name="loopmenu">Menu loop</string>
+    <string name="suspendloopfor1h">Suspendre Loop pour 1h</string>
+    <string name="suspendloopfor2h">Suspendre Loop pour 2h</string>
+    <string name="suspendloopfor3h">Suspendre Loop pour 3h</string>
+    <string name="suspendloopfor10h">Suspendre Loop pour 10h</string>
+    <string name="disconnectpumpfor30m">Déconnecter la pompe 30min</string>
+    <string name="disconnectpumpfor1h">Déconnecter la pompe 1h</string>
+    <string name="disconnectpumpfor2h">Déconnecter la pompe 2h</string>
+    <string name="disconnectpumpfor3h">Déconnecter la pompe 3h</string>
+    <string name="disconnectpumpfor10h">Déconnecter la pompe 10h</string>
+    <string name="resume">Reprendre</string>
+    <string name="smscommunicator_wrongduration">Durée incorrecte</string>
+    <string name="smscommunicator_loopsuspended">Loop suspendu</string>
+    <string name="smscommunicator_loopresumed">Loop relancé</string>
+    <string name="treatments_wizard_bgtrend_label">Tendance 15 min</string>
+    <string name="treatments_wizard_cob_label">GR</string>
+    <string name="superbolus">Superbolus</string>
+    <string name="ns_logappstartedevent">Entrer le démarrage de l\'app dans NS</string>
+    <string name="restartingapp">Sortir de l’application pour modifier les réglages</string>
+    <string name="danarv2pump">DanaRv2</string>
+    <string name="configbuilder_insulin">Insuline</string>
+    <string name="fastactinginsulin">Insuline à action rapide</string>
+    <string name="fastactinginsulincomment">Novorapid, Humalog, Apidra</string>
+    <string name="ultrafastactinginsulincomment">Fiasp</string>
+    <string name="insulin_shortname">INS</string>
+    <string name="fastactinginsulinprolonged">Insuline Rapide à Action Prolongée</string>
+    <string name="enablesuperbolus">Activer les Superbolus dans l’assistant</string>
+    <string name="enablesuperbolus_summary">Activer la fonctionalité superbolus dans l’assistant. Ne pas l’activez jusqu’au moment où vous appreniez comment il fonctionne réellement. IL PEUT PROVOQUER UNE OVERDOSE D’INSULINE SI UTILISÉ AVEUGLÉMENT!</string>
+    <string name="iob">" IR"</string>
+    <string name="cob">GR</string>
+    <string name="predictionshortlabel">"PRÉ "</string>
+    <string name="basalshortlabel">BAS</string>
+    <string name="virtualpump_firmware_label">Firmware</string>
+    <string name="virtualpump_lastconnection_label">Dernière Connexion</string>
+    <string name="danar_bluetooth_status">état du Bluetooth</string>
+    <string name="nav_about">à propos de</string>
+    <string name="smscommunicator_missingsmspermission">Autorisation SMS manquante</string>
+    <string name="dev">DEV</string>
+    <string name="xdripstatus_settings">État Xdrip (hr)</string>
+    <string name="xdripstatus">Barre d\'état pour xDrip (Montre)</string>
+    <string name="xdripstatus_shortname">xds</string>
+    <string name="wear_showbgi_title">Afficher l’IG</string>
+    <string name="wear_showbgi_summary">Ajouter l’IG sur la barre d\'état</string>
+    <string name="ns_noupload">Pas de téléchargement sur NS</string>
+    <string name="ns_noupload_summary">Toutes les données envoyées à NS sont abandonées. AAPS est connecté à NS mais aucun changement dans NS n’est fait</string>
+    <string name="basal_step">Incrément Basal</string>
+    <string name="bolus_step">Incrément Bolus</string>
+    <string name="extendedbolus">Bolus étendu</string>
+    <string name="temptarget">Cible Tempo</string>
+    <string name="overview_extendedbolus_cancel_button">Annuler Bolus étendu</string>
+    <string name="careportal_sensorage_label">Durée capteur</string>
+    <string name="careportal_canulaage_label">Durée canule</string>
+    <string name="careportal_insulinage_label">Durée d\'insuline</string>
+    <string name="hours">Heures</string>
+    <string name="overview_newtempbasal_basaltype_label">Type du Basal</string>
+    <string name="isfmissing">"Facteur SI manquant dans le profile. Utilisez les valeurs par défaut. "</string>
+    <string name="icmissing">I:G manquant dans le profile. Utilisez les valeurs par défaut.</string>
+    <string name="basalmissing">Basal manquant dans le profile. Utilisez les valeurs par défaut</string>
+    <string name="targetmissing">Cible manquante dans le profile. Utilisez les valeurs par défaut</string>
+    <string name="invalidprofile">Profile incorrect!!!</string>
+    <string name="profileswitch">Changement de Profil</string>
+    <string name="careportal_pbage_label">Durée batterie pompe</string>
+    <string name="careportal_pumpbatterychange">Changement Batterie Pompe</string>
+    <string name="ns_alarmoptions">Options d\'alarme</string>
+    <string name="nsalarm_urgenthigh">"Haute urgent "</string>
+    <string name="nsalarm_high">Haute</string>
+    <string name="nsalarm_low">Basse</string>
+    <string name="nsalarm_urgentlow">Basse urgent</string>
+    <string name="nsalarm_summary" formatted="false">Actuellement programmé à %f</string>
+    <string name="nsalarm_staledata">"Données obsolètes "</string>
+    <string name="nsalarm_urgentstaledata">Données obsolètes urgent</string>
+    <string name="nsalarm_staledatavalue_label">"Seuil des données obsolètes [min] "</string>
+    <string name="nsalarm_urgent_staledatavalue_label">Seuil d\'urgence pour les données obsolètes [min]</string>
+    <string name="openapsama_autosens_period">"l’intervalle pour autosens [h] "</string>
+    <string name="openapsama_autosens_period_summary">Le nombre d’heures écoulées pour la détection de sensibilité (le temps d’absorption des glucides est exclu)</string>
+    <string name="ratio_short">SEN</string>
+    <string name="do_not_track_profile_switch">Ignorer les événements de changement de profil</string>
+    <string name="do_not_track_profile_switch_summary">Tout les événements de changement de profils sont ignorés et le profil actif reste le seul profil en activité continue</string>
+    <string name="pump">Pompe</string>
+    <string name="openaps">OpenAPS</string>
+    <string name="device">Dispositif</string>
+    <string name="uploader">Uploader</string>
+    <string name="configbuilder_sensitivity">Détection de sensibilité</string>
+    <string name="sensitivity_shortname">SENS</string>
+    <string name="sensitivityoref0">Sensibilité Oref0</string>
+    <string name="sensitivityaaps">"Sensibilité AAPS "</string>
+    <string name="absorptionsettings_title">Paramètres d’absorption</string>
+    <string name="absorption_maxtime_title">Durée maximale d’absorption pour un repas</string>
+    <string name="absorption_maxtime_summary">Le temps estimé en heures pour une absorbption totale des glucides d’un repas</string>
+    <string name="danar_visualizeextendedaspercentage_title">Afficher le bolus étendu en %</string>
+    <string name="careportal_sensorage_label_short">SAGE</string>
+    <string name="careportal_insulinage_label_short">IAGE</string>
+    <string name="careportal_canulaage_label_short">CAGE</string>
+    <string name="careportal_pbage_label_short">PBAGE</string>
+    <string name="openaps_short">OAPS</string>
+    <string name="uploader_short">UPLD</string>
+    <string name="basal_short">BAS</string>
+    <string name="virtualpump_extendedbolus_label_short">EXT</string>
+    <string name="lock_screen">écran verrouillé</string>
+    <string name="lock_screen_short">verrouiller</string>
+    <string name="sensitivity_warning">En activant la fonction Autosens, n’oubliez pas de rentrer tout les glucides consommés. Sinon les déviations de glucides seront incorrectement identifiées alors que la sensibilité change !!</string>
+    <string name="sensitivityweightedaverage">Sensibilité avec moyenne pondérée</string>
+    <string name="mdtp_ok">OK</string>
+    <string name="mdtp_cancel">Annuler</string>
+    <string name="cpp_sync_setting_missing">Besoin d’être activé(e) pour que les valeurs soient envoyées à la pompe!</string>
+    <string name="cpp_notloadedplugins">Pas tous les profils sont téléchargés!</string>
+    <string name="cpp_valuesnotstored">Valeurs non enregistrées!</string>
+    <string name="wear_overviewnotifications">Notifications d\'aperçu</string>
+    <string name="wear_overviewnotifications_summary">Transférez les notifications d’aperçu comme des messages de confirmation sur la montre.</string>
+    <string name="ns_localbroadcasts">Activer les transmissions de données sur d\'autres app. (ex. Xdrip)</string>
+    <string name="ns_localbroadcasts_title">Activer les transmissions locales.</string>
+    <string name="careportal_activity_label">"ACTIVITÉ "</string>
+    <string name="careportal_question">Question</string>
+    <string name="success">Succès</string>
+    <string name="danar_history_connectingfor" formatted="false">Se connecter pour %d s</string>
+    <string name="careportal_pump_label">POMPE</string>
+    <string name="overview_newtempbasal_basalabsolute">"Valeur Basal [U/h] "</string>
+    <string name="careportal_newnstreatment_duration_min_label">Durée [min]</string>
+    <string name="insulin_oref_peak">Durée du Pic de la Courbe IR</string>
+    <string name="free_peak_oref">Réglage Durée Insuline Post Prandiale Oref</string>
+    <string name="insulin_peak_time">"Durée du Pic [min] "</string>
+    <string name="rapid_acting_oref">"Insuline à Action Rapide Oref "</string>
+    <string name="ultrarapid_oref">Insuline à Action Ultra Rapide Oref</string>
+    <string name="dia_too_short" formatted="false">Durée d’Action pour %s trop courte - utiliser %s à la place!</string>
+    <string name="activate_profile">ACTIVER LE PROFIL</string>
+    <string name="date">" Date"</string>
+    <string name="invalid">INVALID</string>
+    <string name="waitingforpairing">Attente pour le jumelage avec la pompe</string>
+    <string name="pairingok">Jumelage réussi</string>
+    <string name="pairingtimedout">Jumelage interrompu</string>
+    <string name="pairing">JUMELAGE</string>
+    <string name="danars_nodeviceavailable">Jusqu\'à présent aucun appareil n\'a été trouvé</string>
+    <string name="emptyreservoir">Réservoir vide</string>
+    <string name="bloodsugarmeasurementalert">Alerte de mesure de glycémie</string>
+    <string name="remaininsulinalert">Niveau d\'insuline restant</string>
+    <string name="danarspump">DanaRS</string>
+    <string name="danarspump_shortname">Dana</string>
+    <string name="selectedpump">Pompe selectionée</string>
+    <string name="pairpump">Jumeler nouvelle pompe</string>
+    <string name="bolusspeed">Vitesse bolus</string>
+    <string name="danar_setbasalstep001">Régler incrément basal à 0.01 U/h</string>
+    <string name="serialnumber">numéro de série</string>
+    <string name="careportal_newnstreatment_percentage_label">Pourcentage</string>
+    <string name="careportal_newnstreatment_timeshift_label">Time shift</string>
+    <string name="default_temptargets">Cibles Temporaires par défaut</string>
+    <string name="eatingsoon_duration">Durée pour le prochain repas</string>
+    <string name="eatingsoon_target">Cible pour le prochain repas</string>
+    <string name="activity_duration">Durée d\'activité</string>
+    <string name="activity_target">Cible pour l\'activité</string>
+    <string name="danar_history_prime">Amorcer</string>
+    <string name="gettingextendedbolusstatus">Obtenir l\'état du bolus étendu</string>
+    <string name="gettingbolusstatus">Obtenir l\'état du bolus</string>
+    <string name="gettingtempbasalstatus">Obtenir l\'état du basal tempo</string>
+    <string name="gettingpumpsettings">Obtenir les paramètres pompe</string>
+    <string name="gettingpumptime">Obtenir l\'heure sur la pompe</string>
+    <string name="reuse">réutiliser</string>
+    <string name="wearcontrol_title">Commandes depuis la montre</string>
+    <string name="wearcontrol_summary">Définir les Cibles Temp et entrer les Traitements depuis la montre</string>
+    <string name="connectiontimedout">Connexion interrompue</string>
+    <string name="food">Aliments</string>
+    <string name="waitingforestimatedbolusend" formatted="false">Attendre la fin du bolus. %d sec. restants</string>
+    <string name="processinghistory">Traitement d\'événement</string>
+    <string name="startingbolus">Administration du bolus lancée</string>
+    <string name="executingrightnow">Commande exécutée à l\'instant</string>
+    <string name="pumpdrivercorrected">Pilote pompe corrigé</string>
+    <string name="pump_unreachable">"Pompe hors de portée "</string>
+    <string name="missed_bg_readings">Léctures de glycémie qui manquent</string>
+    <string name="raise_notifications_as_android_notifications">Utiliser le système de notifications pour les alertes et les notifications</string>
+    <string name="localalertsettings_title">Alertes locales</string>
+    <string name="enable_missed_bg_readings_alert">Alerte si aucune donnée glycémique n’est reçue</string>
+    <string name="enable_pump_unreachable_alert">Alerte si la pompe est hors portée</string>
+    <string name="pump_unreachable_threshold">Seuil de \"hors portée\" à la pompe</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="btwatchdog_title">BT Watchdog</string>
+    <string name="btwatchdog_summary">Ceci va arrêter le Bluetooth du tel pour une seconde si la pompe n’est pas connectée. Cela pourrait aider dans certains tél où la connexion Bluetooth reste bancale.</string>
+    <string name="DexcomG5">App Dexcom G5 (adaptée)</string>
+    <string name="dexcomg5_nsupload_title">Télécharger Les données glycémiques sur NS</string>
+    <string name="dexcomg5_upload">Paramètres de téléchargement du G5</string>
+    <string name="customapp">APK personalisée pour le téléchargement</string>
+    <string name="wear_detailed_delta_title">Afficher le delta détaillé</string>
+    <string name="wear_detailed_delta_summary">Afficher delta avec une décimale supplémentaire</string>
+    <string name="unsupportedfirmware">"Firmware pompe incompatible "</string>
+    <string name="dexcomg5_xdripupload_title">Transmettre les données G sur xDrip+</string>
+    <string name="dexcomg5_xdripupload_summary">Dand xDrip+ veuillez séléctionner 640g/Eversense comme source de données</string>
+    <string name="nsclientbg">"G NSClient "</string>
+    <string name="minimalbasalvaluereplaced">"Valeur du basal remplacée par la valeur minimale supportée "</string>
+    <string name="overview_editquickwizard_usebg">Calcul de G</string>
+    <string name="overview_editquickwizard_usebolusiob">Calcul IR du Bolus</string>
+    <string name="overview_editquickwizard_usebasaliob">Calcul IR du Basal</string>
+    <string name="overview_editquickwizard_usetrend">Calcul de tendance</string>
+    <string name="overview_editquickwizard_usesuperbolus">Calcul SuperBolus</string>
+    <string name="yes">Oui</string>
+    <string name="no">Non</string>
+    <string name="overview_editquickwizard_usecob">Caclcul GR</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 3b62dffeab..98471c491f 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -129,9 +129,9 @@
     <string name="apsmode_title">APS 모드</string>
     <string name="closedloop">Closed Loop</string>
     <string name="openloop">Open Loop</string>
-    <string name="disabledloop">Loop 비활성화됨</string>
-    <string name="disableloop">Loop 비활성화하기</string>
-    <string name="enableloop">Loop 활성화하기</string>
+    <string name="disabledloop">Loop 중지됨</string>
+    <string name="disableloop">Loop 중지하기</string>
+    <string name="enableloop">Loop 실행하기</string>
     <string name="openloop_newsuggestion">새로운 제안이 있습니다</string>
     <string name="unsupportedclientver">지원하지 않는 NSClient 버전입니다</string>
     <string name="unsupportednsversion">지원하지 않는 Nightscout 버전입니다</string>
@@ -183,7 +183,7 @@
     <string name="overview_tempbasal_button">임시기초주입</string>
     <string name="overview_extendedbolus_button">확장식사주입</string>
     <string name="configbuilder_nightscoutversion_label">Nightscout 버전:</string>
-    <string name="send">보내기</string>
+    <string name="send">전송하기</string>
     <string name="missing">Missing</string>
     <string name="enabled">사용</string>
     <string name="visible">보이기</string>
@@ -252,13 +252,12 @@
     <string name="glucosetype_finger">Finger</string>
     <string name="glucosetype_sensor">Sensor</string>
     <string name="manual">Manual</string>
-    <string name="careportal_temporarytarget">임시 목표</string>
-    <string name="careportal_temporarytargetcancel">임시 목표 취소</string>
+    <string name="careportal_temporarytarget">임시목표</string>
+    <string name="careportal_temporarytargetcancel">임시목표 취소</string>
     <string name="danarprofile">DanaR 프로파일 설정</string>
     <string name="danarprofile_dia">인슐린활동시간(DIA) [h]</string>
     <string name="danarprofile_dia_summary">Duration of Insulin Activity</string>
     <string name="failedupdatebasalprofile">기초주입 프로파일 갱신 실패</string>
-    <string name="danar_history">과거기록</string>
     <string name="danar_historyreload">새로고침</string>
     <string name="uploading">업로드중</string>
     <string name="danar_ebolus">E bolus</string>
@@ -306,14 +305,15 @@
     <string name="objectives_5_objective">필요하면 기초주입과 비율을 조절하고, auto-sens를 활성화한다.</string>
     <string name="objectives_5_gate">평소의 탄수화물을 입력하면서 1주일동안 낮시간대에 loop를 성공적으로 사용해본다.</string>
     <string name="objectives_6_objective">AMA(Advanced Meal Assist)같은 낮시간대를 위한 추가적인 기능들을 실행하여 본다.</string>
+    <string name="objectives_7_objective">낮시간대에 SMB(Super Micro Bolus)같은 추가기능을 활성화해 사용해본다.</string>
     <string name="youareonallowedlimit">허용된 제한값에 도달하였습니다</string>
     <string name="noprofileselected">프로파일이 선택되지 않았습니다</string>
     <string name="smscommunicator_loophasbeendisabled">Loop가 중지되었습니다.</string>
     <string name="smscommunicator_loophasbeenenabled">Loop가 실행되었습니다.</string>
     <string name="smscommunicator_loopisdisabled">Loop가 중지중입니다.</string>
     <string name="smscommunicator_loopisenabled">Loop가 실행중입니다.</string>
-    <string name="openapsma_valuelimitedto" formatted="false">%.2f limited to %.2f</string>
-    <string name="openapsma_valueoutofrange" formatted="false">값 %s 은 하드리밋(Hard Limit)를 벗어났습니다</string>
+    <string name="openapsma_valuelimitedto" formatted="false">%.2f, %.2f으로 제한됨</string>
+    <string name="openapsma_valueoutofrange" formatted="false">%s값이 하드리밋(Hard Limit)를 벗어났습니다</string>
     <string name="smscommunicator_remotebasalnotallowed">원격 기초주입설정이 허가되지 않았습니다</string>
     <string name="smscommunicator_remotecommandnotallowed">원격 명령이 허가되지 않았습니다</string>
     <string name="smscommunicator_basalreplywithcode" formatted="false">기초주입 %.2fU/h 을 실행하려면 %s 를 입력하고 답장하세요</string>
@@ -385,20 +385,20 @@
     <string name="MM640g">MM640g</string>
     <string name="ongoingnotificaction">연속 알림</string>
     <string name="old_data">OLD DATA</string>
-    <string name="minago">%d분전</string>
-    <string name="sms_minago">%dmin ago</string>
+    <string name="minago" formatted="false">%d분전</string>
+    <string name="sms_minago" formatted="false">%dmin ago</string>
     <string name="localprofile">Local Profile</string>
     <string name="openapsama">OpenAPS AMA</string>
     <string name="short_avgdelta">Short avg. delta</string>
     <string name="long_avgdelta">Long avg. delta</string>
-    <string name="array_of_elements">Array of %d elements.\nActual value:</string>
+    <string name="array_of_elements" formatted="false">Array of %d elements.\nActual value:</string>
     <string name="openapsma_autosensdata_label">Autosens 정보</string>
     <string name="openapsma_scriptdebugdata_label">Script debug</string>
     <string name="openapsama_useautosens">AMA autosens 기능 사용하기</string>
     <string name="refresheventsfromnightscout">NS에서 이벤트 새로고침</string>
     <string name="eatingsoon">Eating Soon</string>
     <string name="activity">Activity</string>
-    <string name="removerecord">Remove record:</string>
+    <string name="removerecord">기록 삭제:</string>
     <string name="danar_stats">DanaR 통계</string>
     <string name="danar_stats_cumulative_tdd">누적 일총량</string>
     <string name="danar_stats_expweight">지수가중 일총량</string>
@@ -437,7 +437,7 @@
     <string name="always_use_shortavg">단순델타값 대신 단기평균델타값을 항상 사용합니다.</string>
     <string name="always_use_shortavg_summary">xDrip의 혈당데이터에 노이즈가 심할경우 유용합니다.</string>
     <string name="advancedsettings_title">고급 설정</string>
-    <string name="danar_model" formatted="false">Model: %02X Protocol: %02X Code: %02X</string>
+    <string name="danar_model" formatted="false">모델: %02X 프로토콜: %02X 코드: %02X</string>
     <string name="profile">프로파일</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">기본값: 3\n이 값은 중요한 OpenAPS 안전장치입니다. 이 값의 역할은 펌프에 설정되어 있는 최대기초주입량보다 3배를 초과할 수 없게 제한하는 것입니다. 이 값을 변경할 필요는 없을 것이지만, 안전을 위해 "3x max daily; 4x current"이 의미하는 바를 알고 있어야 합니다.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">기본값: 4\n이 값은 "3x max daily; 4x current"의 나머지 절반에 해당하는 또 다른 중요한 OpenAPS 안전장치입니다. 이 값은 펌프에 설정된 최대기초주입량과 관계없이, 설정된 현재시간의 기초주입량에 이 값을 곱한 양을 초과할 수 없게됩니다. 이는 알고리즘의 작동 방식을 이해하기 전에 과도하게 높은 최대 기본을 설정하여 위험한 상황에 빠지지 않도록 보호하기 위한 것입니다. 다시한번, 기본 값은 4배인 것을 알아두세요; 일반적으로 이것을 조정할 필요는 전혀 없으며, 대신 이 안전장치를 변경해야할것처럼 생각이 된다면, 다른 설정을 변경해야 할 가능성이 더 큽니다.</string>
@@ -449,12 +449,12 @@
     <string name="openapsama_link_to_preferncejson_doc_txt">주의!\n보통의 경우 아래의 값을 변경하면 안됩니다. 이 값들을 변경하기 전에 반드시 이곳을 클릭하고 글을 정독해서 확실하게 이해를 하여야 합니다.</string>
     <string name="openapsama_link_to_preferncejson_doc">http://openaps.readthedocs.io/en/latest/docs/walkthrough/phase-3/beyond-low-glucose-suspend.html</string>
     <string name="error_only_numeric_digits_allowed">숫자만 입력가능합니다.</string>
-    <string name="error_only_numeric_digits_range_allowed">이 범위(%1$s - %2$s)안에 해당하는 숫자만 입력가능합니다.</string>
+    <string name="error_only_numeric_digits_range_allowed" formatted="false">이 범위(%1$s - %2$s)안에 해당하는 숫자만 입력가능합니다.</string>
     <string name="error_field_must_not_be_empty">필수 입력 항목입니다.</string>
     <string name="error_phone_not_valid">폰번호가 유효하지 않습니다</string>
     <string name="smscommunicator_invalidphonennumber">SMS폰번호가 유효하지 않습니다</string>
-    <string name="copy_to_clipboard">Copy To Clipboard</string>
-    <string name="copied_to_clipboard">Copied to clipboard</string>
+    <string name="copy_to_clipboard">클립보드에 복사</string>
+    <string name="copied_to_clipboard">클립보드에 복사되었습니다</string>
     <string name="nav_show_logcat">로그 보기</string>
     <string name="overview_calibration">보정</string>
     <string name="overview_calibration_bg_label">혈당 보정</string>
@@ -476,7 +476,7 @@
     <string name="disconnecting">연결끊기중</string>
     <string name="executing">실행중</string>
     <string name="virtualpump_settings">가상펌프 설정</string>
-    <string name="virtualpump_uploadstatus_title">Upload status to NS</string>
+    <string name="virtualpump_uploadstatus_title">NS에 상태 업로드하기</string>
     <string name="wrongpassword">잘못된 비밀번호</string>
     <string name="settings_password">설정 비밀번호</string>
     <string name="unlock_settings">설정 잠금해제</string>
@@ -484,7 +484,7 @@
     <string name="nsclientinternal">내장 NSClient</string>
     <string name="nsclientinternal_shortname">NSCI</string>
     <string name="nsclientinternal_url">URL:</string>
-    <string name="nsclientinternal_autoscroll">Autoscroll</string>
+    <string name="nsclientinternal_autoscroll">자동스크롤</string>
     <string name="restart">Restart</string>
     <string name="nsclientinternal_title">내장 NSClient</string>
     <string name="nsclientinternal_url_title">Nightscout URL</string>
@@ -500,13 +500,13 @@
     <string name="show_queue">Show queue</string>
     <string name="queue">Queue:</string>
     <string name="status">Status:</string>
-    <string name="paused">Paused</string>
+    <string name="paused">일시중지</string>
     <string name="clearlog">Clear log</string>
     <string name="nowritepermission">NSCLIENT이 쓰기 권한이 없습니다. 잘못된 API secret인지 확인해보세요</string>
     <string name="wear_settings">웨어 설정</string>
     <string name="wear_detailedIOB_title">IOB 자세하게 보여주기</string>
     <string name="wear_detailedIOB_summary">워치페이스에 IOB를 식사주입IOB와 기초주입IOB로 나누어서 보여줍니다.</string>
-    <string name="nosuccess">not successful - please check phone</string>
+    <string name="nosuccess">성공하지 못했습니다. 폰을 확인하세요</string>
     <string name="notavailable">알수없음</string>
     <string name="patientage">나이</string>
     <string name="child">어린이</string>
@@ -516,10 +516,9 @@
     <string name="Glimp">Glimp</string>
     <string name="batteryoptimalizationerror">Device does not appear to support battery optimization whitelisting!</string>
     <string name="pleaseallowpermission">권한을 허용하세요.</string>
-    <string name="needwhitelisting">%s needs battery optimalization whitelisting for proper performance</string>
     <string name="loopsuspended">Loop 일시중지</string>
     <string name="loopsuspendedfor" formatted="false">일시중지중 (%d분)</string>
-    <string name="loopsuperbolusfor" formatted="false">Superbolus (%d분)</string>
+    <string name="loopsuperbolusfor" formatted="false">수퍼 식사주입 (%d분)</string>
     <string name="loopmenu">Loop 메뉴</string>
     <string name="suspendloopfor1h">1시간동안 Loop 일시중지</string>
     <string name="suspendloopfor2h">2시간동안 Loop 일시중지</string>
@@ -530,24 +529,24 @@
     <string name="disconnectpumpfor2h">2시간동안 펌프 일시중지</string>
     <string name="disconnectpumpfor3h">3시간동안 펌프 일시중지</string>
     <string name="disconnectpumpfor10h">10시간동안 펌프 일시중지</string>
-    <string name="resume">재시작</string>
+    <string name="resume">재실행</string>
     <string name="smscommunicator_wrongduration">기간이 잘못되었습니다.</string>
-    <string name="smscommunicator_loopsuspended">Loop가 일시중지되었습니다.</string>
-    <string name="smscommunicator_loopresumed">Loop가 재시작되었습니다.</string>
+    <string name="smscommunicator_loopsuspended">Loop가 일시중지 되었습니다.</string>
+    <string name="smscommunicator_loopresumed">Loop가 재실행 되었습니다.</string>
     <string name="treatments_wizard_bgtrend_label">15분 추이</string>
     <string name="treatments_wizard_cob_label">COB</string>
-    <string name="superbolus">Superbolus</string>
+    <string name="superbolus">수퍼 식사주입</string>
     <string name="ns_logappstartedevent">앱시작을 NS에 기록하기</string>
     <string name="restartingapp">설정을 적용하기위해 앱을 종료합니다.</string>
     <string name="danarv2pump">다나Rv2</string>
     <string name="configbuilder_insulin">인슐린</string>
     <string name="fastactinginsulin">Fast Acting Insulin</string>
-    <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
-    <string name="ultrafastactinginsulincomment">Fiasp</string>
+    <string name="fastactinginsulincomment">노보래피드, 휴마로그, 에피드라</string>
+    <string name="ultrafastactinginsulincomment">피아스프(Fiasp)</string>
     <string name="insulin_shortname">INS</string>
     <string name="fastactinginsulinprolonged">Fast Acting Insulin Prolonged</string>
-    <string name="enablesuperbolus">마법사에서 Superbolus 활성화하기</string>
-    <string name="enablesuperbolus_summary">마법사에서 Superbolus 기능을 활성화합니다. 어떤 기능인지 확실히 알기전까지 활성화 하지 마세요. 제대로 알지 못하고 사용하면 일슐린이 과다 주입될 수 있습니다!</string>
+    <string name="enablesuperbolus">마법사에서 수퍼 식사주입 활성화하기</string>
+    <string name="enablesuperbolus_summary">마법사에서 수퍼 식사주입 기능을 활성화합니다. 어떤 기능인지 확실히 알기전까지 활성화 하지 마세요. 제대로 알지 못하고 사용하면 일슐린이 과다 주입될 수 있습니다!</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
     <string name="predictionshortlabel">PRE</string>
@@ -584,15 +583,15 @@
     <string name="careportal_pbage_label">펌프배터리사용기간</string>
     <string name="careportal_pumpbatterychange">펌프 배터리 교체</string>
     <string name="ns_alarmoptions">알람 옵션</string>
-    <string name="nsalarm_urgenthigh">Urgent high</string>
-    <string name="nsalarm_high">High</string>
-    <string name="nsalarm_low">Low</string>
-    <string name="nsalarm_urgentlow">Urgent low</string>
+    <string name="nsalarm_urgenthigh">위험 고혈당</string>
+    <string name="nsalarm_high">고혈당</string>
+    <string name="nsalarm_low">저혈당</string>
+    <string name="nsalarm_urgentlow">위험 저혈당</string>
     <string name="nsalarm_summary" formatted="false">Currently set to %f</string>
-    <string name="nsalarm_staledata">Stale data</string>
-    <string name="nsalarm_urgentstaledata">Urgent stale data</string>
-    <string name="nsalarm_staledatavalue_label">Stale data threshold [min]</string>
-    <string name="nsalarm_urgent_staledatavalue_label">Urgent stale data threshold [min]</string>
+    <string name="nsalarm_staledata">누락 데이터</string>
+    <string name="nsalarm_urgentstaledata">위험 누락 데이터</string>
+    <string name="nsalarm_staledatavalue_label">누락 데이터 기준값[분]</string>
+    <string name="nsalarm_urgent_staledatavalue_label">위험 누락 데이터 기준값[분]</string>
     <string name="openapsama_autosens_period">autosens 시간 [h]</string>
     <string name="openapsama_autosens_period_summary">민감도를 감지하기 위해 계산될 총 시간 (탄수화물 흡수 시간은 제외됩니다.)</string>
     <string name="ratio_short">SEN</string>
@@ -604,8 +603,8 @@
     <string name="uploader">Uploader</string>
     <string name="configbuilder_sensitivity">민감도 감지</string>
     <string name="sensitivity_shortname">SENS</string>
-    <string name="sensitivityoref0">Sensitivity Oref0</string>
-    <string name="sensitivityaaps">Sensitivity AAPS</string>
+    <string name="sensitivityoref0">민감도 Oref0</string>
+    <string name="sensitivityaaps">민감도 AAPS</string>
     <string name="absorptionsettings_title">흡수 설정</string>
     <string name="absorption_maxtime_title">식사 최대 흡수 시간 [h]</string>
     <string name="absorption_maxtime_summary">식사로 섭취한 탄수화물이 모두 흡수될기까지 예상되는 시간</string>
@@ -621,7 +620,7 @@
     <string name="lock_screen">화면 잠금</string>
     <string name="lock_screen_short">잠금</string>
     <string name="sensitivity_warning">Autosense 기능을 켜면 모든 섭취된 탄수화물양을 입력하십시오. 그렇지 않으면 탄수화물 편차(deviations)가 민감도 변화로 잘못 인식될것입니다!!</string>
-    <string name="sensitivityweightedaverage">Sensitivity WeightedAverage</string>
+    <string name="sensitivityweightedaverage">민감도 가중평균</string>
     <string name="mdtp_ok">OK</string>
     <string name="mdtp_cancel">Cancel</string>
     <string name="cpp_sync_setting_missing">needs to be activated to send values to the pump!</string>
@@ -637,13 +636,13 @@
     <string name="careportal_pump_label">펌프</string>
     <string name="overview_newtempbasal_basalabsolute">Basal value [U/h]</string>
     <string name="careportal_newnstreatment_duration_min_label">Duration [min]</string>
-    <string name="insulin_oref_peak">IOB Curve Peak Time</string>
-    <string name="insulin_peak_time">Peak Time [min]</string>
+    <string name="insulin_oref_peak">IOB 커브 피크 시간</string>
+    <string name="insulin_peak_time">피크 시간[분]</string>
     <string name="free_peak_oref">Free-Peak Oref</string>
     <string name="rapid_acting_oref">Rapid-Acting Oref</string>
     <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
-    <string name="dia_too_short" formatted="false">"DIA of %s too short - using %s instead!"</string>
-    <string name="activate_profile">ACTIVATE PROFILE</string>
+    <string name="dia_too_short" formatted="false">"DIA %s는 너무 짧습니다. 대신 %s을 사용하세요!"</string>
+    <string name="activate_profile">프로파일 활성화하기</string>
     <string name="date">Date</string>
     <string name="invalid">INVALID</string>
     <string name="waitingforpairing">펌프연동 대기중</string>
@@ -678,4 +677,60 @@
     <string name="wearcontrol_title">워치로 작동하기</string>
     <string name="wearcontrol_summary">임시목표와 관리입력을 워치로 설정합니다.</string>
     <string name="connectiontimedout">연결시간초과</string>
+    <string name="food">음식</string>
+    <string name="shortgramm">g</string>
+    <string name="none"><![CDATA[<none>]]></string>
+    <string name="shortkilojoul">kJ</string>
+    <string name="shortenergy">En</string>
+    <string name="shortprotein">Pr</string>
+    <string name="shortfat">Fat</string>
+    <string name="active"><![CDATA[<Active>]]></string>
+    <string name="waitingforestimatedbolusend" formatted="false">식사주입 종료를 기다리고 있습니다. %d초 남았습니다.</string>
+    <string name="processinghistory">이벤트 처리중</string>
+    <string name="startingbolus">식사주입을 시작합니다.</string>
+    <string name="executingrightnow">명령을 지금 실행합니다.</string>
+    <string name="pumpdrivercorrected">펌프 드라이버가 수정되었습니다.</string>
+    <string name="pump_unreachable">펌프에 연결할 수 없습니다.</string>
+    <string name="missed_bg_readings">혈당 읽기가 누락되었습니다.</string>
+    <string name="raise_notifications_as_android_notifications">경고와 알림시 시스템 알림 사용하기</string>
+    <string name="localalertsettings_title">자체 경고 기능</string>
+    <string name="enable_missed_bg_readings_alert">혈당 데이터 누락시 경고하기</string>
+    <string name="enable_pump_unreachable_alert">펌프와 연결불가시 경고하기</string>
+    <string name="pump_unreachable_threshold">펌프 연결불가 기준시간[분]</string>
+    <string name="urgent_alarm">긴급 알람</string>
+    <string name="info">정보</string>
+    <string name="bluetooth">블루투스</string>
+    <string name="btwatchdog_title">블루투스 감시기능</string>
+    <string name="btwatchdog_summary">펌프에 연결이 되지 않을때 폰의 블루투스를 1초간 껐다 켭니다. 블루투스 스택이 정지되는 일부폰에 이 기능이 도움이 됩니다.</string>
+    <string name="DexcomG5">(패치된) DexcomG5 앱</string>
+    <string name="dexcomg5_nsupload_title">NS에 혈당데이터 업로드하기</string>
+    <string name="dexcomg5_upload">G5업로드 세팅</string>
+    <string name="customapp">Customized APK for download</string>
+    <string name="wear_detailed_delta_title">델타(혈당증분값) 자세히 보여주기</string>
+    <string name="wear_detailed_delta_summary">소수점 한자리 더 추가된 델타 보여주기</string>
+    <string name="unsupportedfirmware">지원되지 않는 펌프 펌웨어</string>
+    <string name="dexcomg5_xdripupload_title">혈당 데이터를 xDrip+에 전송하기</string>
+    <string name="dexcomg5_xdripupload_summary">xDrip+ 데이터 소스에서 640g/Eversense을 선택하세요</string>
+    <string name="minimalbasalvaluereplaced">지원되는 최소값으로 기초주입량이 대체되었습니다.</string>
+    <string name="overview_editquickwizard_usebg">혈당 계산</string>
+    <string name="overview_editquickwizard_usebolusiob">식사주입 IOB 계산</string>
+    <string name="overview_editquickwizard_usebasaliob">기초주입 IOB 계산</string>
+    <string name="overview_editquickwizard_usetrend">추세계산</string>
+    <string name="overview_editquickwizard_usesuperbolus">수퍼 식사주입 계산</string>
+    <string name="yes">네</string>
+    <string name="no">아니오</string>
+    <string name="positiveonly">양수만</string>
+    <string name="negativeonly">음수만</string>
+    <string name="overview_editquickwizard_usecob">COB 계산</string>
+    <string name="overview_editquickwizard_usetemptarget">임시목표 계산</string>
+    <string name="loopenabled">Loop 활성화됨</string>
+    <string name="apsselected">APS 선택됨</string>
+    <string name="nsclienthaswritepermission">NSClient가 쓰기권한이 있습니다</string>
+    <string name="closedmodeenabled">Closed 모드가 활성화됨</string>
+    <string name="maxiobset">최대 IOB가 바르게 설정됨</string>
+    <string name="hasbgdata">선택한 소스에서 혈당이 들어옵니다.</string>
+    <string name="basalprofilenotaligned" formatted="false">기초주입값이 시간단위로 설정되지 않았습니다: %s</string>
+    <string name="zerovalueinprofile" formatted="false">유효하지 않은 프로파일: %s</string>
+    <string name="danar_history">펌프 이력</string>
+    <string name="extendedbolusdeliveryerror">확장식사주입 에러</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index e40e9c2b59..8a822898df 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -676,16 +676,12 @@
     <string name="wearcontrol_title">Bedieningen via horloge</string>
     <string name="emptyreservoir">Ampull leeg</string>
     <string name="waitingforpairing">Wachten op koppelen van de pomp</string>
-    <string name="pump_errors_history">Storingen</string>
     <string name="profileswitch">Wijzigingen van profiel</string>
     <string name="bluetooth">Bluetooth</string>
     <string name="food">Voeding</string>
     <string name="enable_pump_unreachable_alert">Waarschuwing bij niet bereikbare pomp</string>
     <string name="bolus_frequency_exceeded">Een bolus met dezelfde hoeveelheid was gevraagd binnen de minuut. Om accidentiële of door bugs veroorzaakte dubbele bolussen te vermijden is deze bolus geannuleerd</string>
-    <string name="bolusstopping">estopt Bolus toediening wordt</string>
     <string name="shortfat">Vet</string>
-    <string name="bolusstopped">Bolus toediening gestopt</string>
-    <string name="raise_urgent_alarms_as_android_notification">Gebruik systeem notificaties voor waarschuwingen</string>
     <string name="wear_detailed_delta_title">Toon gedetaillieerde delta</string>
     <string name="unsupportedfirmware">Niet ondersteune pomp firmware</string>
     <string name="DexcomG5">DexcomG5 App (aangepast)</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
new file mode 100644
index 0000000000..ab81436cc5
--- /dev/null
+++ b/app/src/main/res/values-ro/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name"></string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index ad6a2e1166..1fad149686 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -15,11 +15,13 @@
         <item>@string/bg_lang</item>
         <item>@string/cs_lang</item>
         <item>@string/de_lang</item>
+        <item>@string/fr_lang</item>
         <item>@string/nl_lang</item>
         <item>@string/es_lang</item>
         <item>@string/el_lang</item>
         <item>@string/it_lang</item>
         <item>@string/ko_lang</item>
+        <item>@string/ro_lang</item>
         <item>@string/ru_lang</item>
         <item>@string/sv_lang</item>
     </string-array>
@@ -28,11 +30,13 @@
         <item>bg</item>
         <item>cs</item>
         <item>de</item>
+        <item>fr</item>
         <item>nl</item>
         <item>es</item>
         <item>el</item>
         <item>it</item>
         <item>ko</item>
+        <item>ro</item>
         <item>ru</item>
         <item>sv</item>
     </string-array>
@@ -98,4 +102,5 @@
         <item>@string/yes</item>
     </string-array>
 
+    <string name="fr_lang">French</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 4c5c58c993..67def00b04 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -5,6 +5,8 @@
     <color name="iob">#FFFB8C00</color>
     <color name="bolus">#FFFFCC03</color>
     <color name="cob">#8BC34A</color>
+    <color name="uam">#ffea00</color>
+    <color name="zt">#ff9500</color>
     <color name="ratio">#FFFFFF</color>
     <color name="inrange">#00FF00</color>
     <color name="low">#FF0000</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5639a0c713..e5d7a25a22 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -209,6 +209,7 @@
     <string name="es_lang">Spanish</string>
     <string name="el_lang">Greek</string>
     <string name="it_lang">Italian</string>
+    <string name="ro_lang">Romanian</string>
     <string name="ru_lang">Russian</string>
     <string name="sv_lang">Swedish</string>
     <string name="openapsma_maxbasal_title">Max U/hr a Temp Basal can be set to</string>
@@ -268,7 +269,6 @@
     <string name="danarprofile_dia">DIA [h]</string>
     <string name="danarprofile_dia_summary">Duration of Insulin Activity</string>
     <string name="failedupdatebasalprofile">Failed to update basal profile</string>
-    <string name="pump_errors_history">Errors</string>
     <string name="danar_historyreload">Reload</string>
     <string name="uploading">Uploading</string>
     <string name="danar_ebolus">E bolus</string>
@@ -452,9 +452,9 @@
     <string name="danar_model" formatted="false">Model: %02X Protocol: %02X Code: %02X</string>
     <string name="profile">Profile</string>
     <string name="openapsama_max_daily_safety_multiplier" translatable="false">max_daily_safety_multiplier</string>
-    <string name="openapsama_max_daily_safety_multiplier_summary">Default value: 3\nThis is a key OpenAPS safety cap. What this does is limit your basals to be 3x (in this people) your biggest basal rate. You likely will not need to change this, but you should be aware that’s what is discussed about “3x max daily; 4x current” for safety caps.</string>
+    <string name="openapsama_max_daily_safety_multiplier_summary">Default value: 3 This is a key OpenAPS safety cap. What this does is limit your basals to be 3x (in this people) your biggest basal rate. You likely will not need to change this, but you should be aware that’s what is discussed about “3x max daily; 4x current” for safety caps.</string>
     <string name="openapsama_current_basal_safety_multiplier" translatable="false">current_basal_safety_multiplier</string>
-    <string name="openapsama_current_basal_safety_multiplier_summary">Default value: 4\nThis is the other half of the key OpenAPS safety caps, and the other half of “3x max daily; 4x current” of the safety caps. This means your basal, regardless of max basal set on your pump, cannot be any higher than this number times the current level of your basal. This is to prevent people from getting into dangerous territory by setting excessively high max basals before understanding how the algorithm works. Again, the default is 4x; most people will never need to adjust this and are instead more likely to need to adjust other settings if they feel like they are “running into” this safety cap.</string>
+    <string name="openapsama_current_basal_safety_multiplier_summary">Default value: 4 This is the other half of the key OpenAPS safety caps, and the other half of “3x max daily; 4x current” of the safety caps. This means your basal, regardless of max basal set on your pump, cannot be any higher than this number times the current level of your basal. This is to prevent people from getting into dangerous territory by setting excessively high max basals before understanding how the algorithm works. Again, the default is 4x; most people will never need to adjust this and are instead more likely to need to adjust other settings if they feel like they are “running into” this safety cap.</string>
     <string name="openapsama_autosens_max" translatable="false">autosens_max</string>
     <string name="openapsama_autosens_max_summary">Default value: 1.2\nThis is a multiplier cap for autosens (and soon autotune) to set a 20% max limit on how high the autosens ratio can be, which in turn determines how high autosens can adjust basals, how low it can adjust ISF, and how low it can set the BG target.</string>
     <string name="openapsama_autosens_min" translatable="false">autosens_min</string>
@@ -464,9 +464,9 @@
     <string name="openapsama_bolussnooze_dia_divisor" translatable="false">bolussnooze_dia_divisor</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Default value: 2\nBolus snooze is enacted after you do a meal bolus, so the loop won’t counteract with low temps when you’ve just eaten. The example here and default is 2; so a 3 hour DIA means that bolus snooze will be gradually phased out over 1.5 hours (3DIA/2).</string>
     <string name="openapsama_min_5m_carbimpact" translatable="false">min_5m_carbimpact</string>
-    <string name="openapsama_min_5m_carbimpact_summary">Default value: 3.0\nThis is a setting for default carb absorption impact per 5 minutes. The default is an expected 3mg/dl/5min. This affects how fast COB are decayed, and how much carb absorption is assumed in calculating future predicted BG, when BG is falling more than expected, or not rising as much as expected.</string>
+    <string name="openapsama_min_5m_carbimpact_summary">Default value: 3.0 This is a setting for default carb absorption impact per 5 minutes. The default is an expected 3mg/dl/5min. This affects how fast COB are decayed, and how much carb absorption is assumed in calculating future predicted BG, when BG is falling more than expected, or not rising as much as expected.</string>
     <string name="openapsama_link_to_preferncejson_doc_txt">Attention!\nNormally you do not have to change these values below. Please CLICK HERE and READ the text and make sure you UNDERSTAND it before change any of these values.</string>
-    <string name="openapsama_link_to_preferncejson_doc">http://openaps.readthedocs.io/en/latest/docs/walkthrough/phase-3/beyond-low-glucose-suspend.html</string>
+    <string name="openapsama_link_to_preferncejson_doc" translatable="false">http://openaps.readthedocs.io/en/latest/docs/walkthrough/phase-3/beyond-low-glucose-suspend.html</string>
     <string name="error_only_numeric_digits_allowed">Only numeric digits are allowed.</string>
     <string name="error_only_numeric_digits_range_allowed">Only numeric digits within the range %1$s - %2$s are allowed.</string>
     <string name="error_field_must_not_be_empty">The field must not be empty</string>
@@ -692,6 +692,14 @@
     <string name="careportal_pump_label">PUMP</string>
     <string name="overview_newtempbasal_basalabsolute">Basal value [U/h]</string>
     <string name="careportal_newnstreatment_duration_min_label">Duration [min]</string>
+    <string name="openapssmb">OpenAPS SMB</string>
+    <string name="smb_shortname">SMB</string>
+    <string name="key_use_smb">use_smb</string>
+    <string name="key_use_uam">use_uam</string>
+    <string name="enableuam">Enable UAM</string>
+    <string name="enablesmb">Enable SMB</string>
+    <string name="enablesmb_summary">Use Super Micro Boluses instead of temp basal for faster action</string>
+    <string name="enableuam_summary">Detection of Unannounced meals</string>
     <string name="key_insulin_oref_peak" translatable="false">insulin_oref_peak</string>
     <string name="insulin_oref_peak">IOB Curve Peak Time</string>
     <string name="insulin_peak_time">Peak Time [min]</string>
@@ -781,11 +789,14 @@
     <string name="btwatchdog_summary">Switches off the phone\'s bluetooth for one second if no connection to the pump is possible. This may help on some phones where the bluetooth stack freezes.</string>
     <string name="DexcomG5">DexcomG5 App (patched)</string>
     <string name="dexcomg5_nsupload_title">Upload BG data to NS</string>
-    <string name="key_dexcomg5_nsupload">dexcomg5_nsupload</string>
+    <string name="key_dexcomg5_nsupload" translatable="false">dexcomg5_nsupload</string>
     <string name="dexcomg5_upload">G5 upload settings</string>
     <string name="customapp">Customized APK for download</string>
     <string name="wear_detailed_delta_title">Show detailed delta</string>
     <string name="wear_detailed_delta_summary">Show delta with one more decimal place</string>
+    <string name="smbmaxminutes">45 60 75 90 105 120</string>
+    <string name="smbmaxminutes_summary">Max minutes of basal to limit SMB to</string>
+    <string name="key_smbmaxminutes" translatable="false">smbmaxminutes</string>
     <string name="unsupportedfirmware">Unsupported pump firmware</string>
     <string name="dexcomg5_xdripupload_title">Send BG data to xDrip+</string>
     <string name="key_dexcomg5_xdripupload" translatable="false">dexcomg5_xdripupload</string>
@@ -818,7 +829,7 @@
     <string name="combo_pump_activity_label">Activity</string>
     <string name="combo_no_pump_connection">No connection for %d min</string>
     <string name="combo_tbr_remaining">%d%% (%d min remaining)</string>
-    <string name="combo_last_bolus">%.1f U (%s, %s)</string>
+    <string name="combo_last_bolus" translatable="false">%.1f U (%s, %s)</string>
     <string name="combo_pump_action_initializing">Initializing</string>
     <string name="combo_pump_state_disconnected">Disconnected</string>
     <string name="combo_pump_state_suspended_due_to_error">Suspended due to error</string>
@@ -852,7 +863,7 @@
     <string name="combo_notification_check_time_date">Pump clock update needed</string>
     <string name="combo_history">History</string>
     <string name="combo_warning">Warning</string>
-    <string name="combo_read_full_history_warning">This will read the full history and state of the pump. Everything in \"My Data\" and  the basal rate. Boluses and TBRs will be added to Treatments if they don\'t already exist. This can cause entries to be duplicated because the pump\'s time is imprecise. Using this when normally looping with the pump is highly discouraged and reserved for special circumstances. If you still want to do this, long press this button again.\n\nWARNING: this can trigger a bug which causes the pump to reject all connection attempts and requires pressing a button on the pump to recover and should therefore be avoided.</string>
+    <string name="combo_read_full_history_warning">This will read the full history and state of the pump. Everything in My Data and the basal rate. Boluses and TBRs will be added to Treatments if they don\'t already exist. This can cause entries to be duplicated because the pump\'s time is imprecise. Using this when normally looping with the pump is highly discouraged and reserved for special circumstances. If you still want to do this, long press this button again.  WARNING: this can trigger a bug which causes the pump to reject all connection attempts and requires pressing a button on the pump to recover and should therefore be avoided.</string>
     <string name="combo_read_full_history_confirmation">Are you really sure you want to read all pump data and take the consequences of this action?</string>
     <string name="combo_pump_tbr_cancelled_warrning">TBR CANCELLED warning was confirmed</string>
     <string name="combo_error_no_bolus_delivered">Bolus delivery failed. It appears no bolus was delivered. To be sure, please check the pump to avoid a double bolus and then bolus again. To guard against bugs, boluses are not automatically retried.</string>
@@ -901,5 +912,21 @@
     <string name="day">day</string>
     <string name="week">week</string>
     <string name="time_plural">s</string>
+    <string name="key_enableSMB_always" translatable="false">enableSMB_always</string>
+    <string name="key_enableSMB_with_COB" translatable="false">enableSMB_with_COB</string>
+    <string name="key_enableSMB_with_temptarget" translatable="false">enableSMB_with_temptarget</string>
+    <string name="key_enableSMB_after_carbs" translatable="false">enableSMB_after_carbs</string>
+    <string name="key_allowSMB_with_high_temptarget" translatable="false">enableSMB_with_high_temptarget</string>
+    <string name="enablesmbalways">Enable SMB always</string>
+    <string name="enablesmbalways_summary">Enable SMB always independently to boluses. Possible only with BG source with nice filtering of data like G5</string>
+    <string name="enablesmbaftercarbs">Enable SMB after carbs</string>
+    <string name="enablesmbaftercarbs_summary">Enable SMB for 6h after carbs, even with 0 COB. Possible only with BG source with nice filtering of data like G5</string>
+    <string name="enablesmbwithcob">Enable SMB with COB</string>
+    <string name="enablesmbwithcob_summary">Enable SMB when there is COB active.</string>
+    <string name="enablesmbwithtemptarget">Enable SMB with temp targets</string>
+    <string name="enablesmbwithtemptarget_summary">Enable SMB when there is temp target active (eating soon, exercise)</string>
+    <string name="enablesmbwithhightemptarget">Enable SMB with high temp targets</string>
+    <string name="enablesmbwithhightemptarget_summary">Enable SMB when there is high temp target active (exercise)</string>
+    <string name="let_temp_basal_run">Let current temp basal run</string>
 </resources>
 
diff --git a/app/src/main/res/xml/pref_advanced.xml b/app/src/main/res/xml/pref_advanced.xml
index 25beb5fda7..4a617c29ec 100644
--- a/app/src/main/res/xml/pref_advanced.xml
+++ b/app/src/main/res/xml/pref_advanced.xml
@@ -4,125 +4,113 @@
     <PreferenceCategory
         android:key="advanced"
         android:title="@string/advancedsettings_title">
-        <PreferenceScreen
-            android:title="@string/advancedsettings_title">
-            <PreferenceCategory
-                android:title="@string/nightscout">
+        <PreferenceScreen android:title="@string/advancedsettings_title">
+            <PreferenceCategory android:title="@string/nightscout">
                 <SwitchPreference
                     android:defaultValue="false"
                     android:key="@string/key_ns_upload_only"
-                    android:title="@string/ns_upload_only"
-                    android:summary="@string/ns_upload_only_summary"/>
+                    android:summary="@string/ns_upload_only_summary"
+                    android:title="@string/ns_upload_only" />
                 <SwitchPreference
                     android:defaultValue="false"
                     android:key="@string/key_ns_noupload"
-                    android:title="@string/ns_noupload"
-                    android:summary="@string/ns_noupload_summary"/>
+                    android:summary="@string/ns_noupload_summary"
+                    android:title="@string/ns_noupload" />
                 <SwitchPreference
                     android:defaultValue="false"
                     android:key="ns_sync_use_absolute"
                     android:title="@string/ns_sync_use_absolute_title" />
             </PreferenceCategory>
-            <PreferenceCategory
-                android:title="@string/superbolus">
+            <PreferenceCategory android:title="@string/superbolus">
                 <SwitchPreference
                     android:defaultValue="false"
                     android:key="@string/key_usesuperbolus"
-                    android:title="@string/enablesuperbolus"
-                    android:summary="@string/enablesuperbolus_summary"/>
+                    android:summary="@string/enablesuperbolus_summary"
+                    android:title="@string/enablesuperbolus" />
             </PreferenceCategory>
-            <PreferenceCategory
-                android:title="@string/openapsma">
+            <PreferenceCategory android:title="@string/openapsma">
                 <SwitchPreference
                     android:defaultValue="false"
                     android:key="always_use_shortavg"
-                    android:title="@string/always_use_shortavg"
-                    android:summary="@string/always_use_shortavg_summary"/>
+                    android:summary="@string/always_use_shortavg_summary"
+                    android:title="@string/always_use_shortavg" />
             </PreferenceCategory>
-            <PreferenceCategory
-                android:title="OpenAPS preferences.json">
-                <Preference
-                    android:summary="@string/openapsama_link_to_preferncejson_doc_txt" >
+            <PreferenceCategory android:title="OpenAPS preferences.json">
+                <Preference android:summary="@string/openapsama_link_to_preferncejson_doc_txt">
                     <intent
                         android:action="android.intent.action.VIEW"
                         android:data="@string/openapsama_link_to_preferncejson_doc" />
                 </Preference>
                 <com.andreabaccega.widget.ValidatingEditTextPreference
-                    validate:testType="numericRange"
-                    validate:minNumber="1"
-                    validate:maxNumber="10"
-                    android:digits="0123456789.,"
                     android:defaultValue="3"
-                    android:selectAllOnFocus="true"
-                    android:inputType="number"
-                    android:maxLines="20"
-                    android:title="@string/openapsama_max_daily_safety_multiplier"
                     android:dialogMessage="@string/openapsama_max_daily_safety_multiplier_summary"
-                    android:key="openapsama_max_daily_safety_multiplier" />
-                <com.andreabaccega.widget.ValidatingEditTextPreference
-                    validate:testType="numericRange"
-                    validate:minNumber="1"
-                    validate:maxNumber="10"
                     android:digits="0123456789.,"
-                    android:defaultValue="4"
-                    android:selectAllOnFocus="true"
-                    android:singleLine="true"
                     android:inputType="number"
+                    android:key="openapsama_max_daily_safety_multiplier"
                     android:maxLines="20"
-                    android:title="@string/openapsama_current_basal_safety_multiplier"
-                    android:dialogMessage="@string/openapsama_current_basal_safety_multiplier_summary"
-                    android:key="openapsama_current_basal_safety_multiplier" />
-                <com.andreabaccega.widget.ValidatingEditTextPreference
-                    validate:testType="floatNumericRange"
-                    validate:floatminNumber="0.5"
-                    validate:floatmaxNumber="3"
-                    android:digits="0123456789.,"
-                    android:defaultValue="1.2"
                     android:selectAllOnFocus="true"
-                    android:singleLine="true"
-                    android:inputType="numberDecimal"
-                    android:maxLines="20"
-                    android:title="@string/openapsama_autosens_max"
-                    android:dialogMessage="@string/openapsama_autosens_max_summary"
-                    android:key="openapsama_autosens_max" />
-                <com.andreabaccega.widget.ValidatingEditTextPreference
-                    validate:testType="floatNumericRange"
-                    validate:floatminNumber="0.1"
-                    validate:floatmaxNumber="1.0"
-                    android:defaultValue="0.7"
-                    android:selectAllOnFocus="true"
-                    android:singleLine="true"
-                    android:inputType="numberDecimal"
-                    android:maxLines="20"
-                    android:title="@string/openapsama_autosens_min"
-                    android:dialogMessage="@string/openapsama_autosens_min_summary"
-                    android:key="openapsama_autosens_min" />
-                <SwitchPreference
-                    android:defaultValue="true"
-                    android:key="openapsama_autosens_adjusttargets"
-                    android:title="@string/openapsama_autosens_adjusttargets"
-                    android:summary="@string/openapsama_autosens_adjusttargets_summary"/>
-                <com.andreabaccega.widget.ValidatingEditTextPreference
-                    validate:testType="floatNumericRange"
-                    validate:minNumber="1"
+                    android:title="@string/openapsama_max_daily_safety_multiplier"
                     validate:maxNumber="10"
+                    validate:minNumber="1"
+                    validate:testType="numericRange" />
+                <com.andreabaccega.widget.ValidatingEditTextPreference
+                    android:defaultValue="4"
+                    android:dialogMessage="@string/openapsama_current_basal_safety_multiplier_summary"
                     android:digits="0123456789.,"
-                    android:defaultValue="2"
+                    android:inputType="number"
+                    android:key="openapsama_current_basal_safety_multiplier"
+                    android:maxLines="20"
                     android:selectAllOnFocus="true"
                     android:singleLine="true"
+                    android:title="@string/openapsama_current_basal_safety_multiplier"
+                    validate:maxNumber="10"
+                    validate:minNumber="1"
+                    validate:testType="numericRange" />
+                <com.andreabaccega.widget.ValidatingEditTextPreference
+                    android:defaultValue="1.2"
+                    android:dialogMessage="@string/openapsama_autosens_max_summary"
+                    android:digits="0123456789.,"
                     android:inputType="numberDecimal"
+                    android:key="openapsama_autosens_max"
                     android:maxLines="20"
-                    android:title="@string/openapsama_bolussnooze_dia_divisor"
+                    android:selectAllOnFocus="true"
+                    android:singleLine="true"
+                    android:title="@string/openapsama_autosens_max"
+                    validate:floatmaxNumber="3"
+                    validate:floatminNumber="0.5"
+                    validate:testType="floatNumericRange" />
+                <com.andreabaccega.widget.ValidatingEditTextPreference
+                    android:defaultValue="0.7"
+                    android:dialogMessage="@string/openapsama_autosens_min_summary"
+                    android:inputType="numberDecimal"
+                    android:key="openapsama_autosens_min"
+                    android:maxLines="20"
+                    android:selectAllOnFocus="true"
+                    android:singleLine="true"
+                    android:title="@string/openapsama_autosens_min"
+                    validate:floatmaxNumber="1.0"
+                    validate:floatminNumber="0.1"
+                    validate:testType="floatNumericRange" />
+                <com.andreabaccega.widget.ValidatingEditTextPreference
+                    android:defaultValue="2"
                     android:dialogMessage="@string/openapsama_bolussnooze_dia_divisor_summary"
-                    android:key="openapsama_bolussnooze_dia_divisor" />
+                    android:digits="0123456789.,"
+                    android:inputType="numberDecimal"
+                    android:key="openapsama_bolussnooze_dia_divisor"
+                    android:maxLines="20"
+                    android:selectAllOnFocus="true"
+                    android:singleLine="true"
+                    android:title="@string/openapsama_bolussnooze_dia_divisor"
+                    validate:maxNumber="10"
+                    validate:minNumber="1"
+                    validate:testType="floatNumericRange" />
             </PreferenceCategory>
-            <PreferenceCategory
-                android:title="@string/profile">
+            <PreferenceCategory android:title="@string/profile">
                 <SwitchPreference
                     android:defaultValue="false"
                     android:key="@string/key_do_not_track_profile_switch"
-                    android:title="@string/do_not_track_profile_switch"
-                    android:summary="@string/do_not_track_profile_switch_summary"/>
+                    android:summary="@string/do_not_track_profile_switch_summary"
+                    android:title="@string/do_not_track_profile_switch" />
             </PreferenceCategory>
 
             <PreferenceCategory
diff --git a/app/src/main/res/xml/pref_openapsama.xml b/app/src/main/res/xml/pref_openapsama.xml
index 4cd507e163..7dfcf7ad72 100644
--- a/app/src/main/res/xml/pref_openapsama.xml
+++ b/app/src/main/res/xml/pref_openapsama.xml
@@ -21,6 +21,11 @@
             android:defaultValue="false"
             android:key="openapsama_useautosens"
             android:title="@string/openapsama_useautosens" />
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="openapsama_autosens_adjusttargets"
+            android:summary="@string/openapsama_autosens_adjusttargets_summary"
+            android:title="@string/openapsama_autosens_adjusttargets" />
 
     </PreferenceCategory>
 
diff --git a/app/src/main/res/xml/pref_openapssmb.xml b/app/src/main/res/xml/pref_openapssmb.xml
new file mode 100644
index 0000000000..da0b64a91c
--- /dev/null
+++ b/app/src/main/res/xml/pref_openapssmb.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:validate="http://schemas.android.com/apk/res-auto">
+    <PreferenceCategory
+        android:key="openapssmb"
+        android:title="@string/openapssmb">
+        <EditTextPreference
+            android:defaultValue="1"
+            android:key="openapsma_max_basal"
+            android:numeric="decimal"
+            android:dialogMessage="@string/openapsma_maxbasal_summary"
+            android:title="@string/openapsma_maxbasal_title" />
+        <EditTextPreference
+            android:defaultValue="1.5"
+            android:key="openapsma_max_iob"
+            android:numeric="decimal"
+            android:dialogMessage="@string/openapsma_maxiob_summary"
+            android:title="@string/openapsma_maxiob_title" />
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="openapsama_useautosens"
+            android:title="@string/openapsama_useautosens" />
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_use_smb"
+            android:summary="@string/enablesmb_summary"
+            android:title="@string/enablesmb" />
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_enableSMB_with_COB"
+            android:summary="@string/enablesmbwithcob_summary"
+            android:title="@string/enablesmbwithcob"
+            android:dependency="@string/key_use_smb"/>
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_enableSMB_with_temptarget"
+            android:summary="@string/enablesmbwithtemptarget_summary"
+            android:title="@string/enablesmbwithtemptarget"
+            android:dependency="@string/key_use_smb"/>
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_allowSMB_with_high_temptarget"
+            android:summary="@string/enablesmbwithhightemptarget_summary"
+            android:title="@string/enablesmbwithhightemptarget"
+            android:dependency="@string/key_use_smb"/>
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_enableSMB_always"
+            android:summary="@string/enablesmbalways_summary"
+            android:title="@string/enablesmbalways"
+            android:dependency="@string/key_use_smb"/>
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_enableSMB_after_carbs"
+            android:summary="@string/enablesmbaftercarbs_summary"
+            android:title="@string/enablesmbaftercarbs"
+            android:dependency="@string/key_use_smb"/>
+        <com.andreabaccega.widget.ValidatingEditTextPreference
+            android:defaultValue="30"
+            android:dialogMessage="@string/smbmaxminutes"
+            android:digits="0123456789"
+            android:inputType="number"
+            android:key="key_smbmaxminutes"
+            android:maxLines="20"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
+            android:title="@string/smbmaxminutes_summary"
+            validate:maxNumber="120"
+            validate:minNumber="15"
+            validate:testType="numericRange" />
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_use_uam"
+            android:summary="@string/enableuam_summary"
+            android:title="@string/enableuam" />
+    </PreferenceCategory>
+
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_others.xml b/app/src/main/res/xml/pref_others.xml
index 548b99e5b9..ba16f09c2f 100644
--- a/app/src/main/res/xml/pref_others.xml
+++ b/app/src/main/res/xml/pref_others.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:validate="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory
         android:key="others"
         android:title="@string/othersettings_title">
@@ -76,12 +77,16 @@
             android:defaultValue="true"
             android:key="@string/key_enable_pump_unreachable_alert"
             android:title="@string/enable_pump_unreachable_alert" />
-        <EditTextPreference
+        <com.andreabaccega.widget.ValidatingEditTextPreference
+            validate:testType="numericRange"
+            validate:minNumber="30"
+            validate:maxNumber="300"
             android:defaultValue="30"
             android:dependency="@string/key_enable_pump_unreachable_alert"
             android:inputType="number"
             android:key="@string/key_pump_unreachable_threshold"
-            android:title="@string/pump_unreachable_threshold"></EditTextPreference>
+            android:title="@string/pump_unreachable_threshold">
+        </com.andreabaccega.widget.ValidatingEditTextPreference>
     </PreferenceScreen>
     <SwitchPreference
         android:defaultValue="false"
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefBasePluginTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefBasePluginTest.java
new file mode 100644
index 0000000000..83e9442364
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/Insulin/InsulinOrefBasePluginTest.java
@@ -0,0 +1,153 @@
+package info.nightscout.androidaps.plugins.Insulin;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import info.nightscout.androidaps.data.Iob;
+import info.nightscout.androidaps.db.Treatment;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Created by triplem on 07.01.18.
+ */
+
+public class InsulinOrefBasePluginTest extends InsulinOrefBasePlugin {
+
+    private int peak;
+    private double dia;
+
+    private boolean shortDiaNotificationSend;
+
+    @Before
+    public void setUp() throws Exception {
+        this.peak = 0;
+        this.dia = InsulinOrefBasePlugin.MIN_DIA;
+        this.shortDiaNotificationSend = false;
+    }
+
+    @Test
+    public void testGetDia() throws Exception {
+        assertEquals(InsulinOrefBasePlugin.MIN_DIA, this.getDia(), 0);
+
+        this.dia = InsulinOrefBasePlugin.MIN_DIA + 1;
+        assertEquals(InsulinOrefBasePlugin.MIN_DIA + 1, this.getDia(), 0);
+
+        this.dia = InsulinOrefBasePlugin.MIN_DIA - 1;
+        assertEquals(InsulinOrefBasePlugin.MIN_DIA, this.getDia(), 0);
+        assertTrue(this.shortDiaNotificationSend);
+    }
+
+    @Test
+    public void testIobCalcForTreatment() {
+        Treatment treatment = new Treatment();
+        Iob expected = new Iob();
+
+        assertEquals(expected, this.iobCalcForTreatment(treatment, 0, 0d));
+
+        this.peak = 30;
+        this.dia = 4;
+        long time = System.currentTimeMillis();
+
+        // check directly after bolus
+        treatment.date = time;
+        treatment.insulin = 10d;
+        assertEquals(10d, this.iobCalcForTreatment(treatment, time).iobContrib, 0.1);
+
+        // check after 1 hour
+        treatment.date = time - 1 * 60 * 60 * 1000; // 1 hour
+        treatment.insulin = 10d;
+        assertEquals(3.92, this.iobCalcForTreatment(treatment, time).iobContrib, 0.1);
+
+        // check after 2 hour
+        treatment.date = time - 2 * 60 * 60 * 1000; // 1 hour
+        treatment.insulin = 10d;
+        assertEquals(0.77, this.iobCalcForTreatment(treatment, time).iobContrib, 0.1);
+
+        // check after 3 hour
+        treatment.date = time - 3 * 60 * 60 * 1000; // 1 hour
+        treatment.insulin = 10d;
+        assertEquals(0.10, this.iobCalcForTreatment(treatment, time).iobContrib, 0.1);
+
+        // check after dia
+        treatment.date = time - 4 * 60 * 60 * 1000;
+        treatment.insulin = 10d;
+        assertEquals(0d, this.iobCalcForTreatment(treatment, time).iobContrib, 0.1);
+    }
+
+
+    /**
+     * this method is implemented to allow tests of the iobCalcForTreatment calculation
+      * @return
+     */
+    @Override
+    int getPeak() {
+        return this.peak;
+    }
+
+    /**
+     * Userdefined Dia is implemented to allow tests of the getDia method
+     *
+     * @return
+     */
+    public double getUserDefinedDia() {
+        return this.dia;
+    }
+
+    void sendShortDiaNotification(double dia) {
+        this.shortDiaNotificationSend = true;
+    }
+
+
+    // the following methods are implemented, but not needed...
+    @Override
+    String commentStandardText() {
+        return null;
+    }
+
+    @Override
+    public String getFragmentClass() {
+        return null;
+    }
+
+    @Override
+    public int getId() {
+        return 0;
+    }
+
+    @Override
+    public String getName() {
+        return null;
+    }
+
+    @Override
+    public String getFriendlyName() {
+        return null;
+    }
+
+    @Override
+    public boolean isEnabled(int type) {
+        return false;
+    }
+
+    @Override
+    public boolean isVisibleInTabs(int type) {
+        return false;
+    }
+
+    @Override
+    public void setFragmentEnabled(int type, boolean fragmentEnabled) {
+
+    }
+
+    @Override
+    public void setFragmentVisible(int type, boolean fragmentVisible) {
+
+    }
+
+    @Override
+    public int getPreferencesId() {
+        return 0;
+    }
+}
diff --git a/build.gradle b/build.gradle
index c068560ec2..e13cb27485 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,12 +10,17 @@ buildscript {
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
+
+        classpath 'com.jakewharton:butterknife-gradle-plugin:8.4.0'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
     }
 }
 
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java
index ea5b41176b..fab81aafb9 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java
@@ -70,7 +70,6 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
     public boolean layoutSet = false;
     public boolean bIsRound = false;
     public int pointSize = 2;
-    public int missed_readings_alert_id = 818;
     public BgGraphBuilder bgGraphBuilder;
     public LineChartView chart;
     public ArrayList<BgWatchData> bgDataList = new ArrayList<>();
@@ -181,7 +180,6 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
                 }
             }
         );
-        ListenerService.requestData(this);
         wakeLock.acquire(50);
     }
 
@@ -638,8 +636,6 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
             chart.setLineChartData(bgGraphBuilder.lineData());
             chart.setViewportCalculationEnabled(true);
             chart.setMaximumViewport(chart.getMaximumViewport());
-        } else {
-            ListenerService.requestData(this);
         }
     }