diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy
index e799493..9207dae 100644
--- a/Jenkinsfile.groovy
+++ b/Jenkinsfile.groovy
@@ -3,49 +3,64 @@ final String mvn = "mvn --batch-mode --update-snapshots"
 pipeline {
     agent any
     stages {
+        stage('Environment') {
+            steps {
+                sh 'set'
+            }
+        }
         stage('no SNAPSHOT in master') {
-            // checks that the pom version is not a snapshot when the current branch is master
-            // TODO: also check for SNAPSHOT when is a pull request with master as the target branch
+            // checks that the pom version is not a snapshot when the current or target branch is master
             when {
                 expression {
-                    (env.GIT_BRANCH == 'master') &&
-                            (readMavenPom(file: 'pom.xml').version).contains("SNAPSHOT") }
+                    (env.GIT_BRANCH == 'master' || env.CHANGE_TARGET == 'master') &&
+                            (readMavenPom(file: 'pom.xml').version).contains("SNAPSHOT")
+                }
             }
             steps {
                 error("Build failed because SNAPSHOT version")
             }
         }
         stage('Static Code Analysis') {
+            when { expression { findFiles(glob: '**/src/main/java/**/*.java').length > 0 } }
             steps {
-                withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') {
-                    sh "${mvn} compile checkstyle:checkstyle pmd:pmd"
+                withMaven(maven: 'maven', jdk: 'JDK LTS') {
+                    sh "${mvn} compile"
+                    sh "${mvn} checkstyle:checkstyle"
+                    sh "${mvn} pmd:pmd"
+                    pmd canComputeNew: false, defaultEncoding: '', healthy: '', pattern: '', unHealthy: ''
                 }
-                pmd canComputeNew: false, defaultEncoding: '', healthy: '', pattern: '', unHealthy: ''
             }
         }
-        stage('Build') {
-            parallel {
-                stage('Java 8') {
-                    steps {
-                        withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') {
-                            sh "${mvn} clean install"
-                        }
+        stage('SonarQube (develop only)') {
+            when { expression { env.GIT_BRANCH == 'develop' && env.GIT_URL.startsWith('https://') } }
+            steps {
+                withSonarQubeEnv('sonarqube') {
+                    withMaven(maven: 'maven', jdk: 'JDK LTS') {
+                        sh "${mvn} org.sonarsource.scanner.maven:sonar-maven-plugin:3.4.0.905:sonar"
                     }
                 }
-                stage('Java 9') {
-                    steps {
-                        withMaven(maven: 'maven 3.5.2', jdk: 'JDK 9') {
-                            sh "${mvn} clean install"
-                        }
-                    }
+            }
+        }
+        stage('Build Java Next') {
+            steps {
+                withMaven(maven: 'maven', jdk: 'JDK Next') {
+                    sh "${mvn} clean install -Djava.version=9"
+                }
+            }
+        }
+        stage('Build Java LTS') {
+            steps {
+                withMaven(maven: 'maven', jdk: 'JDK LTS') {
+                    sh "${mvn} clean install"
                 }
             }
         }
         stage('Test Results') {
+            when { expression { findFiles(glob: '**/target/surefire-reports/*.xml').length > 0 } }
             steps {
                 junit '**/target/surefire-reports/*.xml'
                 jacoco exclusionPattern: '**/*{Test|IT|Main|Application|Immutable}.class'
-                withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') {
+                withMaven(maven: 'maven', jdk: 'JDK LTS') {
                     sh "${mvn} com.gavinmogan:codacy-maven-plugin:coverage " +
                             "-DcoverageReportFile=target/site/jacoco/jacoco.xml " +
                             "-DprojectToken=`$JENKINS_HOME/codacy/token` " +
@@ -55,14 +70,15 @@ pipeline {
             }
         }
         stage('Archiving') {
+            when { expression { findFiles(glob: '**/target/*.jar').length > 0 } }
             steps {
                 archiveArtifacts '**/target/*.jar'
             }
         }
         stage('Deploy') {
-            when { expression { (env.GIT_BRANCH == 'master') } }
+            when { expression { (env.GIT_BRANCH == 'master' && env.GIT_URL.startsWith('https://')) } }
             steps {
-                withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') {
+                withMaven(maven: 'maven', jdk: 'JDK LTS') {
                     sh "${mvn} deploy --activate-profiles release -DskipTests=true"
                 }
             }
diff --git a/README.adoc b/README.adoc
index d4bebd6..5eadee4 100644
--- a/README.adoc
+++ b/README.adoc
@@ -59,7 +59,7 @@ if (isTrue() && isAlsoTrue()) {
 [[source,java]]
 ----
 Condition.where(isTrue())
-         .and(isAlsoTrue())
+         .and(() -> isAlsoTrue())
          .then(() -> doSomething())
          .otherwise(() -> doSomethingElse());
 ----
@@ -78,7 +78,7 @@ if (isTrue() || alternativeIsTrue()) {
 [[source,java]]
 ----
 Condition.where(isTrue())
-         .or(alternativeIsTrue())
+         .or(() -> alternativeIsTrue())
          .then(() -> doSomething())
          .otherwise(() -> doSomethingElse());
 ----
@@ -115,7 +115,7 @@ if (isTrue() || !isFalse()) {
 [[source,java]]
 ----
 Condition.where(isTrue())
-         .andNot(isFalse())
+         .andNot(() -> isFalse())
          .then(() -> doSomething())
          .otherwise(() -> doSomethingElse());
 ----
@@ -134,7 +134,7 @@ if (isFalse() || !isAlsoFalse()) {
 [[source,java]]
 ----
 Condition.where(isFalse())
-         .orNot(isAlsoFalse())
+         .orNot(() -> isAlsoFalse())
          .then(() -> doSomething())
          .otherwise(() -> doSomethingElse());
 ----
@@ -154,7 +154,7 @@ if (isFalse()) {
 ----
 Condition.where(isFalse())
          .then(() -> doSomething())
-         .otherwise(isTrue())
+         .otherwise(() -> isTrue())
          .then(() -> doSomethingElse());
 ----
 
@@ -174,7 +174,7 @@ if (isTrue()) {
 ----
 Condition.where(isTrue())
          .then(() -> doSomething())
-         .and(isAlsoTrue())
+         .and(() -> isAlsoTrue())
          .then(() -> doSomethingElse());
 ----
 
@@ -213,8 +213,9 @@ final Optional<String> result = Value.where(isTrue(), () -> TRUE);
 
 [[source,java]]
 ----
-final String result = Value.<String>where(isTrue()).then(() -> TRUE)
-                                                   .otherwise(() -> FALSE);
+final String result = Value.<String>where(isTrue())
+                           .then(() -> TRUE)
+                           .otherwise(() -> FALSE);
 ----
 
 ### if-not-then-else
@@ -231,8 +232,9 @@ if (!isTrue()) {
 
 [[source,java]]
 ----
-final String result = Value.<String>whereNot(isTrue()).then(() -> TRUE)
-                                                      .otherwise(() -> FALSE);
+final String result = Value.<String>whereNot(isTrue())
+                           .then(() -> TRUE)
+                           .otherwise(() -> FALSE);
 ----
 
 ### if-and-then-else
@@ -249,9 +251,10 @@ if (isTrue() && alternativeIsTrue()) {
 
 [[source,java]]
 ----
-final String result = Value.<String>where(isTrue()).and(alternativeIsTrue())
-                                                   .then(() -> TRUE)
-                                                   .otherwise(() -> FALSE);
+final String result = Value.<String>where(isTrue())
+                           .and(() -> alternativeIsTrue())
+                           .then(() -> TRUE)
+                           .otherwise(() -> FALSE);
 ----
 
 ### if-and-not-then-else
@@ -268,9 +271,10 @@ if (isTrue() && !alternativeIsFalse()) {
 
 [[source,java]]
 ----
-final String result = Value.<String>where(isTrue()).andNot(alternativeIsFalse())
-                                                   .then(() -> TRUE)
-                                                   .otherwise(() -> FALSE);
+final String result = Value.<String>where(isTrue())
+                           .andNot(() -> alternativeIsFalse())
+                           .then(() -> TRUE)
+                           .otherwise(() -> FALSE);
 ----
 
 ### if-or-then-else
@@ -287,9 +291,10 @@ if (isTrue() || alternativeIsTrue()) {
 
 [[source,java]]
 ----
-final String result = Value.<String>where(isTrue()).or(alternativeIsTrue())
-                                                   .then(() -> TRUE)
-                                                   .otherwise(() -> FALSE);
+final String result = Value.<String>where(isTrue())
+                           .or(() -> alternativeIsTrue())
+                           .then(() -> TRUE)
+                           .otherwise(() -> FALSE);
 ----
 
 ### if-or-not-then-else
@@ -306,7 +311,27 @@ if (isTrue() || !isFalse()) {
 
 [[source,java]]
 ----
-final String result = Value.<String>where(isTrue()).orNot(isFalse())
-                                                   .then(() -> TRUE)
-                                                   .otherwise(() -> FALSE);
+final String result = Value.<String>where(isTrue())
+                           .orNot(() -> isFalse())
+                           .then(() -> TRUE)
+                           .otherwise(() -> FALSE);
 ----
+
+### if-then
+
+[[source,java]]
+-----
+Optional<String> result;
+if (isTrue()) {
+    result = Optional.of(TRUE);
+} else {
+    result = Optional.empty();
+}
+-----
+
+[[source,java]]
+-----
+final Optional<String> result = Value.<String>where(isTrue())
+                                     .then(() -> TRUE)
+                                     .optional();
+-----
diff --git a/pom.xml b/pom.xml
index 18f42b7..38800de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,9 +16,7 @@
         <assertj.version>3.9.1</assertj.version>
         <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
         <tiles-maven-plugin.version>2.10</tiles-maven-plugin.version>
-        <kemitix-tiles.version>0.7.1</kemitix-tiles.version>
-        <maven-surefire-plugin.version>2.20.1</maven-surefire-plugin.version>
-        <maven-failsafe-plugin.version>2.20.1</maven-failsafe-plugin.version>
+        <kemitix-tiles.version>0.8.1</kemitix-tiles.version>
         <lombok.version>1.16.20</lombok.version>
     </properties>
 
diff --git a/src/main/java/net/kemitix/conditional/Condition.java b/src/main/java/net/kemitix/conditional/Condition.java
index 000268c..c87a74f 100644
--- a/src/main/java/net/kemitix/conditional/Condition.java
+++ b/src/main/java/net/kemitix/conditional/Condition.java
@@ -21,6 +21,8 @@
 
 package net.kemitix.conditional;
 
+import java.util.function.Supplier;
+
 /**
  * If-then-else in a functional-style.
  *
@@ -35,9 +37,11 @@ public interface Condition {
      *
      * @return the Condition
      */
-    @SuppressWarnings("avoidinlineconditionals")
     static Condition where(final boolean clause) {
-        return clause ? TrueCondition.TRUE : FalseCondition.FALSE;
+        if (clause) {
+            return TrueCondition.TRUE;
+        }
+        return FalseCondition.FALSE;
     }
 
     /**
@@ -58,7 +62,7 @@ public interface Condition {
      *
      * @return the Condition
      */
-    Condition and(boolean clause);
+    Condition and(Supplier<Boolean> clause);
 
     /**
      * Logically AND combine the current {@code Condition} with boolean opposite of the clause.
@@ -67,8 +71,8 @@ public interface Condition {
      *
      * @return the Condition
      */
-    default Condition andNot(final boolean clause) {
-        return and(!clause);
+    default Condition andNot(final Supplier<Boolean> clause) {
+        return and(() -> !clause.get());
     }
 
     /**
@@ -79,7 +83,7 @@ public interface Condition {
      * @return the Condition
      */
     @SuppressWarnings("PMD.ShortMethodName")
-    Condition or(boolean clause);
+    Condition or(Supplier<Boolean> clause);
 
     /**
      * Logically OR combine the current {@code Condition} with the boolean opposite of the clause.
@@ -88,8 +92,8 @@ public interface Condition {
      *
      * @return the Condition
      */
-    default Condition orNot(final boolean clause) {
-        return or(!clause);
+    default Condition orNot(final Supplier<Boolean> clause) {
+        return or(() -> !clause.get());
     }
 
     /**
@@ -115,8 +119,8 @@ public interface Condition {
      *
      * @return the Condition
      */
-    default Condition otherwise(final boolean clause) {
-        return where(clause);
+    default Condition otherwise(final Supplier<Boolean> clause) {
+        return where(clause.get());
     }
 
 }
diff --git a/src/main/java/net/kemitix/conditional/FalseCondition.java b/src/main/java/net/kemitix/conditional/FalseCondition.java
index 07881c7..3ffdbd2 100644
--- a/src/main/java/net/kemitix/conditional/FalseCondition.java
+++ b/src/main/java/net/kemitix/conditional/FalseCondition.java
@@ -21,6 +21,8 @@
 
 package net.kemitix.conditional;
 
+import java.util.function.Supplier;
+
 /**
  * A {@code Condition} that has evaluated to {@code false}.
  *
@@ -31,14 +33,14 @@ final class FalseCondition implements Condition {
     public static final Condition FALSE = new net.kemitix.conditional.FalseCondition();
 
     @Override
-    public Condition and(final boolean clause) {
+    public Condition and(final Supplier<Boolean> clause) {
         return FALSE;
     }
 
     @Override
     @SuppressWarnings("PMD.ShortMethodName")
-    public Condition or(final boolean secondClause) {
-        return Condition.where(secondClause);
+    public Condition or(final Supplier<Boolean> secondClause) {
+        return Condition.where(secondClause.get());
     }
 
     @Override
diff --git a/src/main/java/net/kemitix/conditional/FalseValueClause.java b/src/main/java/net/kemitix/conditional/FalseValueClause.java
index 672d285..f4283c3 100644
--- a/src/main/java/net/kemitix/conditional/FalseValueClause.java
+++ b/src/main/java/net/kemitix/conditional/FalseValueClause.java
@@ -21,6 +21,7 @@
 
 package net.kemitix.conditional;
 
+import java.util.Optional;
 import java.util.function.Supplier;
 
 /**
@@ -32,34 +33,41 @@ import java.util.function.Supplier;
  */
 class FalseValueClause<T> implements Value.ValueClause<T> {
 
-    protected static final Value.ValueClause FALSE = new FalseValueClause();
+    protected static final Value.ValueClause<?> FALSE = new FalseValueClause<>();
 
     @Override
     public ValueSupplier<T> then(final Supplier<T> trueSupplier) {
-        return new FalseValueSupplier();
+        return new FalseValueSupplier<>();
     }
 
     @Override
-    public Value.ValueClause<T> and(final boolean clause) {
+    public Value.ValueClause<T> and(final Supplier<Boolean> clause) {
         return this;
     }
 
     @Override
     @SuppressWarnings("PMD.ShortMethodName")
-    public Value.ValueClause<T> or(final boolean clause) {
-        return Value.where(clause);
+    public Value.ValueClause<T> or(final Supplier<Boolean> clause) {
+        return Value.where(clause.get());
     }
 
     /**
      * An intermediate result of the {@link Value} where the clause has evaluated to false.
+     *
+     * @param <T> the type of the value
      */
-    private class FalseValueSupplier implements ValueSupplier<T> {
+    private static final class FalseValueSupplier<T> implements ValueSupplier<T> {
 
         @Override
         public T otherwise(final Supplier<T> falseSupplier) {
             return falseSupplier.get();
         }
 
+        @Override
+        public Optional<T> optional() {
+            return Optional.empty();
+        }
+
     }
 
 }
diff --git a/src/main/java/net/kemitix/conditional/TrueCondition.java b/src/main/java/net/kemitix/conditional/TrueCondition.java
index 06f041b..0691433 100644
--- a/src/main/java/net/kemitix/conditional/TrueCondition.java
+++ b/src/main/java/net/kemitix/conditional/TrueCondition.java
@@ -21,6 +21,8 @@
 
 package net.kemitix.conditional;
 
+import java.util.function.Supplier;
+
 /**
  * A {@code Condition} that has evaluated to {@code true}.
  *
@@ -31,13 +33,13 @@ final class TrueCondition implements Condition {
     public static final Condition TRUE = new net.kemitix.conditional.TrueCondition();
 
     @Override
-    public Condition and(final boolean clause) {
-        return Condition.where(clause);
+    public Condition and(final Supplier<Boolean> clause) {
+        return Condition.where(clause.get());
     }
 
     @Override
     @SuppressWarnings("PMD.ShortMethodName")
-    public Condition or(final boolean secondClause) {
+    public Condition or(final Supplier<Boolean> secondClause) {
         return TRUE;
     }
 
diff --git a/src/main/java/net/kemitix/conditional/TrueValueClause.java b/src/main/java/net/kemitix/conditional/TrueValueClause.java
index 9d3fbcc..46903c5 100644
--- a/src/main/java/net/kemitix/conditional/TrueValueClause.java
+++ b/src/main/java/net/kemitix/conditional/TrueValueClause.java
@@ -23,6 +23,7 @@ package net.kemitix.conditional;
 
 import lombok.RequiredArgsConstructor;
 
+import java.util.Optional;
 import java.util.function.Supplier;
 
 /**
@@ -34,37 +35,45 @@ import java.util.function.Supplier;
  */
 class TrueValueClause<T> implements Value.ValueClause<T> {
 
-    protected static final Value.ValueClause TRUE = new TrueValueClause();
+    protected static final Value.ValueClause<?> TRUE = new TrueValueClause<>();
 
     @Override
     public ValueSupplier<T> then(final Supplier<T> trueSupplier) {
-        return new TrueValueSupplier(trueSupplier);
+        return new TrueValueSupplier<>(trueSupplier);
     }
 
     @Override
-    public Value.ValueClause<T> and(final boolean clause) {
-        return Value.where(clause);
+    public Value.ValueClause<T> and(final Supplier<Boolean> clause) {
+        return Value.where(clause.get());
     }
 
     @Override
     @SuppressWarnings("PMD.ShortMethodName")
-    public Value.ValueClause<T> or(final boolean clause) {
+    public Value.ValueClause<T> or(final Supplier<Boolean> clause) {
         return this;
     }
 
     /**
      * An intermediate result of the {@link Value} where the clause has evaluated to true.
+     *
+     * @param <T> the type of the value
      */
     @RequiredArgsConstructor
-    private class TrueValueSupplier implements ValueSupplier<T> {
+    private static final class TrueValueSupplier<T> implements ValueSupplier<T> {
 
-        private final transient Supplier<T> valueSupplier;
+        @SuppressWarnings("PMD.BeanMembersShouldSerialize")
+        private final Supplier<T> valueSupplier;
 
         @Override
         public T otherwise(final Supplier<T> falseSupplier) {
             return valueSupplier.get();
         }
 
+        @Override
+        public Optional<T> optional() {
+            return Optional.ofNullable(valueSupplier.get());
+        }
+
     }
 
 }
diff --git a/src/main/java/net/kemitix/conditional/Value.java b/src/main/java/net/kemitix/conditional/Value.java
index 9b1c3b6..c07737a 100644
--- a/src/main/java/net/kemitix/conditional/Value.java
+++ b/src/main/java/net/kemitix/conditional/Value.java
@@ -43,9 +43,9 @@ public interface Value {
      */
     @SuppressWarnings("PMD.LawOfDemeter")
     static <T> T where(
-            boolean clause,
-            Supplier<T> trueSupplier,
-            Supplier<T> falseSupplier
+            final boolean clause,
+            final Supplier<T> trueSupplier,
+            final Supplier<T> falseSupplier
                       ) {
         return Value.<T>where(clause).then(trueSupplier)
                                      .otherwise(falseSupplier);
@@ -61,8 +61,8 @@ public interface Value {
      * @return an Optional either containing the value from the trueSupplier or empty
      */
     static <T> Optional<T> where(
-            boolean clause,
-            Supplier<T> trueSupplier
+            final boolean clause,
+            final Supplier<T> trueSupplier
                                 ) {
         return Optional.ofNullable(Value.where(clause, trueSupplier, () -> null));
     }
@@ -75,9 +75,12 @@ public interface Value {
      *
      * @return a true or false value clause
      */
-    @SuppressWarnings({"unchecked", "avoidinlineconditionals"})
+    @SuppressWarnings("unchecked")
     static <T> ValueClause<T> where(final boolean clause) {
-        return (ValueClause<T>) (clause ? TrueValueClause.TRUE : FalseValueClause.FALSE);
+        if (clause) {
+            return (ValueClause<T>) TrueValueClause.TRUE;
+        }
+        return (ValueClause<T>) FalseValueClause.FALSE;
     }
 
     /**
@@ -88,7 +91,7 @@ public interface Value {
      *
      * @return a true or false value clause
      */
-    static <T> ValueClause<T> whereNot(boolean clause) {
+    static <T> ValueClause<T> whereNot(final boolean clause) {
         return where(!clause);
     }
 
@@ -115,7 +118,7 @@ public interface Value {
          *
          * @return a true or false value clause
          */
-        ValueClause<T> and(boolean clause);
+        ValueClause<T> and(Supplier<Boolean> clause);
 
         /**
          * Logically OR combine the current {@link ValueClause} with clause.
@@ -125,7 +128,7 @@ public interface Value {
          * @return a true or false value clause
          */
         @SuppressWarnings("PMD.ShortMethodName")
-        ValueClause<T> or(boolean clause);
+        ValueClause<T> or(Supplier<Boolean> clause);
 
         /**
          * Logically AND combine the current {@link ValueClause} with boolean opposite of the clause.
@@ -134,8 +137,8 @@ public interface Value {
          *
          * @return a true or false value clause
          */
-        default ValueClause<T> andNot(final boolean clause) {
-            return and(!clause);
+        default ValueClause<T> andNot(final Supplier<Boolean> clause) {
+            return and(() -> !clause.get());
         }
 
         /**
@@ -145,8 +148,8 @@ public interface Value {
          *
          * @return a true or false value clause
          */
-        default ValueClause<T> orNot(boolean clause) {
-            return or(!clause);
+        default ValueClause<T> orNot(final Supplier<Boolean> clause) {
+            return or(() -> !clause.get());
         }
 
         /**
@@ -165,6 +168,12 @@ public interface Value {
              */
             T otherwise(Supplier<T> falseSupplier);
 
+            /**
+             * Returns the value in an Optional if the {@link ValueClause} is true, or an empty Optional if it is false.
+             *
+             * @return an Optional, possibly containing the value
+             */
+            Optional<T> optional();
         }
 
     }
diff --git a/src/test/java/net/kemitix/conditional/ConditionalTest.java b/src/test/java/net/kemitix/conditional/ConditionalTest.java
index 525c534..5124b7f 100644
--- a/src/test/java/net/kemitix/conditional/ConditionalTest.java
+++ b/src/test/java/net/kemitix/conditional/ConditionalTest.java
@@ -3,6 +3,8 @@ package net.kemitix.conditional;
 import org.junit.Before;
 import org.junit.Test;
 
+import java.util.concurrent.atomic.AtomicInteger;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -76,9 +78,9 @@ public class ConditionalTest {
     public void whereTrueThenDoSomethingAndThenDoSomethingElse() {
         //when
         Condition.where(true)
-                 .then(thenResponse)
-                 .and(true)
-                 .then(otherwiseResponse);
+                .then(thenResponse)
+                .and(() -> true)
+                .then(otherwiseResponse);
         //then
         assertThatBothResponsesRun();
     }
@@ -119,7 +121,7 @@ public class ConditionalTest {
     public void whereNotFalseThenRuns() {
         //when
         Condition.whereNot(false)
-                 .then(thenResponse);
+                .then(thenResponse);
         //then
         assertThatTheThenResponseRuns();
     }
@@ -128,8 +130,8 @@ public class ConditionalTest {
     public void whereNotTrueThenOtherwiseRuns() {
         //when
         Condition.whereNot(true)
-                 .then(thenResponse)
-                 .otherwise(otherwiseResponse);
+                .then(thenResponse)
+                .otherwise(otherwiseResponse);
         //then
         assertThatTheOtherwiseResponseRuns();
     }
@@ -138,8 +140,8 @@ public class ConditionalTest {
     public void whereTrueAndNotFalseThenRuns() {
         //when
         Condition.where(true)
-                 .andNot(false)
-                 .then(thenResponse);
+                .andNot(() -> false)
+                .then(thenResponse);
         //then
         assertThatTheThenResponseRuns();
     }
@@ -148,9 +150,9 @@ public class ConditionalTest {
     public void whereTrueAndNotTrueThenOtherwiseRuns() {
         //when
         Condition.where(true)
-                 .andNot(true)
-                 .then(thenResponse)
-                 .otherwise(otherwiseResponse);
+                .andNot(() -> true)
+                .then(thenResponse)
+                .otherwise(otherwiseResponse);
         //then
         assertThatTheOtherwiseResponseRuns();
     }
@@ -159,8 +161,8 @@ public class ConditionalTest {
     public void whereFalseOrNotFalseThenRuns() {
         //when
         Condition.where(false)
-                 .orNot(false)
-                 .then(thenResponse);
+                .orNot(() -> false)
+                .then(thenResponse);
         //then
         assertThatTheThenResponseRuns();
     }
@@ -169,9 +171,9 @@ public class ConditionalTest {
     public void whereFalseOrNotTrueThenOtherwiseRuns() {
         //when
         Condition.where(false)
-                 .orNot(true)
-                 .then(thenResponse)
-                 .otherwise(otherwiseResponse);
+                .orNot(() -> true)
+                .then(thenResponse)
+                .otherwise(otherwiseResponse);
         //then
         assertThatTheOtherwiseResponseRuns();
     }
@@ -180,9 +182,9 @@ public class ConditionalTest {
     public void whereFalseElseTrueThenOtherwiseRuns() {
         //when
         Condition.where(false)
-                 .then(thenResponse)
-                 .otherwise(true)
-                 .then(otherwiseResponse);
+                .then(thenResponse)
+                .otherwise(() -> true)
+                .then(otherwiseResponse);
         //then
         assertThatTheOtherwiseResponseRuns();
     }
@@ -191,9 +193,9 @@ public class ConditionalTest {
     public void whereFalseElseFalseThenNothingRuns() {
         //when
         Condition.where(false)
-                 .then(thenResponse)
-                 .otherwise(false)
-                 .then(otherwiseResponse);
+                .then(thenResponse)
+                .otherwise(() -> false)
+                .then(otherwiseResponse);
         //then
         assertThatNoResponseRuns();
     }
@@ -202,8 +204,8 @@ public class ConditionalTest {
     public void whereTrueChainedThensBothRuns() {
         //when
         Condition.where(true)
-                 .then(thenResponse)
-                 .then(otherwiseResponse);
+                .then(thenResponse)
+                .then(otherwiseResponse);
         //then
         assertThatBothResponsesRun();
     }
@@ -212,8 +214,8 @@ public class ConditionalTest {
     public void whereFalseChainedThensNothingRuns() {
         //when
         Condition.where(false)
-                 .then(thenResponse)
-                 .then(otherwiseResponse);
+                .then(thenResponse)
+                .then(otherwiseResponse);
         //then
         assertThatNoResponseRuns();
     }
@@ -235,22 +237,22 @@ public class ConditionalTest {
 
     private void assertThatTheOtherwiseResponseRan() {
         assertThat(otherwiseFlag).as("otherwise response runs")
-                                 .isTrue();
+                .isTrue();
     }
 
     private void assertThatTheThenResponseRan() {
         assertThat(thenFlag).as("then response runs")
-                            .isTrue();
+                .isTrue();
     }
 
     private void assertThatTheOtherwiseResponseDidNotRun() {
         assertThat(otherwiseFlag).as("otherwise response does not run")
-                                 .isFalse();
+                .isFalse();
     }
 
     private void assertThatTheThenResponseDidNotRun() {
         assertThat(thenFlag).as("then response does not run")
-                            .isFalse();
+                .isFalse();
     }
 
     private void assertThatNoResponseRuns() {
@@ -260,27 +262,53 @@ public class ConditionalTest {
 
     private void when(final boolean clause) {
         Condition.where(clause)
-                 .then(thenResponse)
-                 .otherwise(otherwiseResponse);
+                .then(thenResponse)
+                .otherwise(otherwiseResponse);
     }
 
     private void when(
             final boolean firstClause,
             final boolean secondClause
-                     ) {
+    ) {
         Condition.where(firstClause)
-                 .and(secondClause)
-                 .then(thenResponse)
-                 .otherwise(otherwiseResponse);
+                .and(() -> secondClause)
+                .then(thenResponse)
+                .otherwise(otherwiseResponse);
     }
 
     private void whenOr(
             final boolean firstClause,
             final boolean secondClause
-                       ) {
+    ) {
         Condition.where(firstClause)
-                 .or(secondClause)
-                 .then(thenResponse)
-                 .otherwise(otherwiseResponse);
+                .or(() -> secondClause)
+                .then(thenResponse)
+                .otherwise(otherwiseResponse);
+    }
+
+    @Test
+    public void shortCurcuitOr() {
+        //given
+        final AtomicInteger atomicInteger = new AtomicInteger();
+        //when
+        Condition.where(true)
+                .or(() -> atomicInteger.compareAndSet(0, 2))
+                .then(thenResponse);
+        //then
+        assertThatTheThenResponseRan();
+        assertThat(atomicInteger).hasValue(0);
+    }
+
+    @Test
+    public void shortCurcuitAnd() {
+        //given
+        final AtomicInteger atomicInteger = new AtomicInteger();
+        //when
+        Condition.where(false)
+                .and(() -> atomicInteger.compareAndSet(0, 2))
+                .then(thenResponse);
+        //then
+        assertThatTheThenResponseDidNotRun();
+        assertThat(atomicInteger).hasValue(0);
     }
 }
diff --git a/src/test/java/net/kemitix/conditional/ValueTest.java b/src/test/java/net/kemitix/conditional/ValueTest.java
index d76011b..3c72c6e 100644
--- a/src/test/java/net/kemitix/conditional/ValueTest.java
+++ b/src/test/java/net/kemitix/conditional/ValueTest.java
@@ -4,6 +4,7 @@ import lombok.val;
 import org.junit.Test;
 
 import java.util.Optional;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -52,7 +53,7 @@ public class ValueTest {
     public void valueWhereClauseIsTrue() {
         //when
         val result = Value.<String>where(true).then(() -> TRUE)
-                                              .otherwise(() -> FALSE);
+                .otherwise(() -> FALSE);
         //then
         assertThat(result).isEqualTo(TRUE);
     }
@@ -61,7 +62,7 @@ public class ValueTest {
     public void valueWhereClauseIsFalse() {
         //when
         val result = Value.<String>where(false).then(() -> TRUE)
-                                               .otherwise(() -> FALSE);
+                .otherwise(() -> FALSE);
         //then
         assertThat(result).isEqualTo(FALSE);
     }
@@ -69,9 +70,9 @@ public class ValueTest {
     @Test
     public void valueWhereTrueAndTrueIsTrue() {
         //when
-        val result = Value.<String>where(true).and(true)
-                                              .then(() -> TRUE)
-                                              .otherwise(() -> FALSE);
+        val result = Value.<String>where(true).and(() -> true)
+                .then(() -> TRUE)
+                .otherwise(() -> FALSE);
         //then
         assertThat(result).isEqualTo(TRUE);
     }
@@ -79,9 +80,9 @@ public class ValueTest {
     @Test
     public void valueWhereTrueAndFalseIsFalse() {
         //when
-        val result = Value.<String>where(true).and(false)
-                                              .then(() -> TRUE)
-                                              .otherwise(() -> FALSE);
+        val result = Value.<String>where(true).and(() -> false)
+                .then(() -> TRUE)
+                .otherwise(() -> FALSE);
         //then
         assertThat(result).isEqualTo(FALSE);
     }
@@ -89,9 +90,9 @@ public class ValueTest {
     @Test
     public void valueWhereFalseAndTrueIsFalse() {
         //when
-        val result = Value.<String>where(false).and(true)
-                                               .then(() -> TRUE)
-                                               .otherwise(() -> FALSE);
+        val result = Value.<String>where(false).and(() -> true)
+                .then(() -> TRUE)
+                .otherwise(() -> FALSE);
         //then
         assertThat(result).isEqualTo(FALSE);
     }
@@ -99,9 +100,9 @@ public class ValueTest {
     @Test
     public void valueWhereFalseAndFalseIsFalse() {
         //when
-        val result = Value.<String>where(false).and(false)
-                                               .then(() -> TRUE)
-                                               .otherwise(() -> FALSE);
+        val result = Value.<String>where(false).and(() -> false)
+                .then(() -> TRUE)
+                .otherwise(() -> FALSE);
         //then
         assertThat(result).isEqualTo(FALSE);
     }
@@ -109,9 +110,9 @@ public class ValueTest {
     @Test
     public void valueWhereTrueOrTrueIsTrue() {
         //when
-        val result = Value.<String>where(true).or(true)
-                                              .then(() -> TRUE)
-                                              .otherwise(() -> FALSE);
+        val result = Value.<String>where(true).or(() -> true)
+                .then(() -> TRUE)
+                .otherwise(() -> FALSE);
         //then
         assertThat(result).isEqualTo(TRUE);
     }
@@ -119,9 +120,9 @@ public class ValueTest {
     @Test
     public void valueWhereTrueOrFalseIsTrue() {
         //when
-        val result = Value.<String>where(true).or(false)
-                                              .then(() -> TRUE)
-                                              .otherwise(() -> FALSE);
+        val result = Value.<String>where(true).or(() -> false)
+                .then(() -> TRUE)
+                .otherwise(() -> FALSE);
         //then
         assertThat(result).isEqualTo(TRUE);
     }
@@ -129,9 +130,9 @@ public class ValueTest {
     @Test
     public void valueWhereFalseOrTrueIsTrue() {
         //when
-        val result = Value.<String>where(false).or(true)
-                                               .then(() -> TRUE)
-                                               .otherwise(() -> FALSE);
+        val result = Value.<String>where(false).or(() -> true)
+                .then(() -> TRUE)
+                .otherwise(() -> FALSE);
         //then
         assertThat(result).isEqualTo(TRUE);
     }
@@ -139,9 +140,9 @@ public class ValueTest {
     @Test
     public void valueWhereFalseOrFalseIsFalse() {
         //when
-        val result = Value.<String>where(false).or(false)
-                                               .then(() -> TRUE)
-                                               .otherwise(() -> FALSE);
+        val result = Value.<String>where(false).or(() -> false)
+                .then(() -> TRUE)
+                .otherwise(() -> FALSE);
         //then
         assertThat(result).isEqualTo(FALSE);
     }
@@ -150,7 +151,7 @@ public class ValueTest {
     public void valueWhereNotTrueIsFalse() {
         //when
         val result = Value.<String>whereNot(true).then(() -> TRUE)
-                                                 .otherwise(() -> FALSE);
+                .otherwise(() -> FALSE);
         //then
         assertThat(result).isEqualTo(FALSE);
     }
@@ -159,7 +160,7 @@ public class ValueTest {
     public void valueWhereNotFalseIsTrue() {
         //when
         val result = Value.<String>whereNot(false).then(() -> TRUE)
-                                                  .otherwise(() -> FALSE);
+                .otherwise(() -> FALSE);
         //then
         assertThat(result).isEqualTo(TRUE);
     }
@@ -167,9 +168,9 @@ public class ValueTest {
     @Test
     public void valueWhereTrueAndNotTrueIsFalse() {
         //when
-        val result = Value.<String>where(true).andNot(true)
-                                              .then(() -> TRUE)
-                                              .otherwise(() -> FALSE);
+        val result = Value.<String>where(true).andNot(() -> true)
+                .then(() -> TRUE)
+                .otherwise(() -> FALSE);
         //then
         assertThat(result).isEqualTo(FALSE);
     }
@@ -177,9 +178,9 @@ public class ValueTest {
     @Test
     public void valueWhereTrueAndNotFalseIsTrue() {
         //when
-        val result = Value.<String>where(true).andNot(false)
-                                              .then(() -> TRUE)
-                                              .otherwise(() -> FALSE);
+        val result = Value.<String>where(true).andNot(() -> false)
+                .then(() -> TRUE)
+                .otherwise(() -> FALSE);
         //then
         assertThat(result).isEqualTo(TRUE);
     }
@@ -187,9 +188,9 @@ public class ValueTest {
     @Test
     public void valueWhereFalseAndNotTrueIsFalse() {
         //when
-        val result = Value.<String>where(false).andNot(true)
-                                               .then(() -> TRUE)
-                                               .otherwise(() -> FALSE);
+        val result = Value.<String>where(false).andNot(() -> true)
+                .then(() -> TRUE)
+                .otherwise(() -> FALSE);
         //then
         assertThat(result).isEqualTo(FALSE);
     }
@@ -197,9 +198,9 @@ public class ValueTest {
     @Test
     public void valueWhereFalseAndNotFalseIsFalse() {
         //when
-        val result = Value.<String>where(false).andNot(false)
-                                               .then(() -> TRUE)
-                                               .otherwise(() -> FALSE);
+        val result = Value.<String>where(false).andNot(() -> false)
+                .then(() -> TRUE)
+                .otherwise(() -> FALSE);
         //then
         assertThat(result).isEqualTo(FALSE);
     }
@@ -207,9 +208,9 @@ public class ValueTest {
     @Test
     public void valueWhereTrueOrNotTrueIsTrue() {
         //when
-        val result = Value.<String>where(true).orNot(true)
-                                              .then(() -> TRUE)
-                                              .otherwise(() -> FALSE);
+        val result = Value.<String>where(true).orNot(() -> true)
+                .then(() -> TRUE)
+                .otherwise(() -> FALSE);
         //then
         assertThat(result).isEqualTo(TRUE);
     }
@@ -217,9 +218,9 @@ public class ValueTest {
     @Test
     public void valueWhereTrueOrNotFalseIsTrue() {
         //when
-        val result = Value.<String>where(true).orNot(false)
-                                              .then(() -> TRUE)
-                                              .otherwise(() -> FALSE);
+        val result = Value.<String>where(true).orNot(() -> false)
+                .then(() -> TRUE)
+                .otherwise(() -> FALSE);
         //then
         assertThat(result).isEqualTo(TRUE);
     }
@@ -227,9 +228,9 @@ public class ValueTest {
     @Test
     public void valueWhereFalseOrNotTrueIsFalse() {
         //when
-        val result = Value.<String>where(false).orNot(true)
-                                               .then(() -> TRUE)
-                                               .otherwise(() -> FALSE);
+        val result = Value.<String>where(false).orNot(() -> true)
+                .then(() -> TRUE)
+                .otherwise(() -> FALSE);
         //then
         assertThat(result).isEqualTo(FALSE);
     }
@@ -237,10 +238,54 @@ public class ValueTest {
     @Test
     public void valueWhereFalseOrNotFalseIsTrue() {
         //when
-        val result = Value.<String>where(false).orNot(false)
-                                               .then(() -> TRUE)
-                                               .otherwise(() -> FALSE);
+        val result = Value.<String>where(false).orNot(() -> false)
+                .then(() -> TRUE)
+                .otherwise(() -> FALSE);
         //then
         assertThat(result).isEqualTo(TRUE);
     }
+
+    @Test
+    public void valueWhereTrueThenIsNotEmpty() {
+        //given
+        final Optional<Object> result = Value.where(true).then(() -> "value").optional();
+        //then
+        assertThat(result).contains("value");
+    }
+
+    @Test
+    public void valueWhereFalseThenIsEmpty() {
+        //given
+        final Optional<Object> result = Value.where(false).then(() -> "value").optional();
+        //when
+        assertThat(result).isEmpty();
+    }
+
+    @Test
+    public void shortCurcuitOr() {
+        //given
+        final AtomicInteger atomicInteger = new AtomicInteger();
+        //when
+        final Optional<String> result = Value.<String>where(true)
+                .or(() -> atomicInteger.compareAndSet(0, 2))
+                .then(() -> "Pass")
+                .optional();
+        //then
+        assertThat(result).contains("Pass");
+        assertThat(atomicInteger).hasValue(0);
+    }
+
+    @Test
+    public void shortCurcuitAnd() {
+        //given
+        final AtomicInteger atomicInteger = new AtomicInteger();
+        //when
+        final Optional<String> result = Value.<String>where(false)
+                .and(() -> atomicInteger.compareAndSet(0, 2))
+                .then(() -> "Pass")
+                .optional();
+        //then
+        assertThat(result).isEmpty();
+        assertThat(atomicInteger).hasValue(0);
+    }
 }