diff --git a/src/plugins/condition/Condition.js b/src/plugins/condition/Condition.js
index 6ff4a41b56..ab3bc0858d 100644
--- a/src/plugins/condition/Condition.js
+++ b/src/plugins/condition/Condition.js
@@ -24,7 +24,7 @@ import * as EventEmitter from 'eventemitter3';
 import uuid from 'uuid';
 import TelemetryCriterion from "@/plugins/condition/criterion/TelemetryCriterion";
 import { TRIGGER } from "@/plugins/condition/utils/constants";
-import {computeConditionForAll, computeConditionForAny} from "@/plugins/condition/utils/evaluator";
+import {computeCondition} from "@/plugins/condition/utils/evaluator";
 
 /*
 * conditionDefinition = {
@@ -228,11 +228,7 @@ export default class ConditionClass extends EventEmitter {
 
     //TODO: implement as part of the evaluator class task.
     evaluate() {
-        if (this.trigger === TRIGGER.ANY) {
-            this.result = computeConditionForAny(this.criteriaResults);
-        } else if (this.trigger === TRIGGER.ALL) {
-            this.result = computeConditionForAll(this.criteriaResults);
-        }
+        this.result = computeCondition(this.criteriaResults, this.trigger === TRIGGER.ALL);
     }
 
     emitEvent(eventName, data) {
diff --git a/src/plugins/condition/components/ConditionEdit.vue b/src/plugins/condition/components/ConditionEdit.vue
index d4625aed5c..a6b821999c 100644
--- a/src/plugins/condition/components/ConditionEdit.vue
+++ b/src/plugins/condition/components/ConditionEdit.vue
@@ -89,7 +89,7 @@
                                     <span class="t-configuration">
                                         <span class="controls">
                                             <select v-model="selectedTelemetryKey"
-                                                    @change="telemetryChange"
+                                                    @change="updateTelemetryMetaData"
                                             >
                                                 <option value="">- Select Telemetry -</option>
                                                 <option v-for="telemetryOption in telemetry"
@@ -113,7 +113,7 @@
                                         </span>
                                         <span class="controls">
                                             <select v-model="selectedOperationKey"
-                                                    @change="operationKeyChange"
+                                                    @change="setInputValueVisibility"
                                             >
                                                 <option value="">- Select Comparison -</option>
                                                 <option v-for="option in operations"
@@ -324,7 +324,7 @@ export default {
                 this.condition.definition.output = this.selectedOutputKey;
             }
         },
-        operationKeyChange(ev) {
+        setInputValueVisibility(ev) {
             if (this.selectedOperationKey !== 'isUndefined' && this.selectedOperationKey !== 'isDefined') {
                 this.comparisonValueField = true;
             } else {
@@ -332,7 +332,7 @@ export default {
             }
             //find the criterion being updated and set the operation property
         },
-        telemetryChange() {
+        updateTelemetryMetaData() {
             this.selectedMetaDataKey = '';
             this.updateConditionCriteria();
             this.updateTelemetry();
diff --git a/src/plugins/condition/utils/evaluator.js b/src/plugins/condition/utils/evaluator.js
index f74bb1e5d4..2f0a325f0e 100644
--- a/src/plugins/condition/utils/evaluator.js
+++ b/src/plugins/condition/utils/evaluator.js
@@ -1,28 +1,13 @@
-/**
- * Returns true only if at least one of the results is true
- **/
-export const computeConditionForAny = (resultMap) => {
+export const computeCondition = (resultMap, allMustBeTrue) => {
     let result = false;
     for (let key in resultMap) {
         if (resultMap.hasOwnProperty(key)) {
             result = resultMap[key];
-            if (result) {
-                break;
-            }
-        }
-    }
-    return result;
-};
-
-/**
- * Returns true only if all the results are true
- **/
-export const computeConditionForAll = (resultMap) => {
-    let result = false;
-    for (let key in resultMap) {
-        if (resultMap.hasOwnProperty(key)) {
-            result = resultMap[key];
-            if (!result) {
+            if (allMustBeTrue && !result) {
+                //If we want all conditions to be true, then even one negative result should break.
+                break;
+            } else if (!allMustBeTrue && result) {
+                //If we want at least one condition to be true, then even one positive result should break.
                 break;
             }
         }