diff --git a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/propertiesversion/PropertiesFeatureToggleVersion.java b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/propertiesversion/PropertiesFeatureToggleVersion.java
new file mode 100644
index 000000000..bccf5bd6f
--- /dev/null
+++ b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/propertiesversion/PropertiesFeatureToggleVersion.java
@@ -0,0 +1,27 @@
+package com.iluwatar.featuretoggle.pattern.propertiesversion;
+
+import com.iluwatar.featuretoggle.pattern.Service;
+import com.iluwatar.featuretoggle.user.User;
+
+import java.util.Properties;
+
+public class PropertiesFeatureToggleVersion implements Service {
+
+  private Properties properties;
+
+  public PropertiesFeatureToggleVersion(final Properties properties) {
+    this.properties = properties;
+  }
+
+  @Override
+  public String getWelcomeMessage(final User user) {
+
+    final boolean enhancedWelcome = (boolean) properties.get("enhancedWelcome");
+
+    if (enhancedWelcome) {
+      return "Welcome " + user + ". You're using the enhanced welcome message.";
+    }
+
+    return "Welcome to the application.";
+  }
+}
diff --git a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/tieredversion/TieredFeatureToggleVersion.java b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/tieredversion/TieredFeatureToggleVersion.java
index 8411339ef..330015ac3 100644
--- a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/tieredversion/TieredFeatureToggleVersion.java
+++ b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/tieredversion/TieredFeatureToggleVersion.java
@@ -9,7 +9,7 @@ public class TieredFeatureToggleVersion implements Service {
   @Override
   public String getWelcomeMessage(User user) {
     if (UserGroup.isPaid(user)) {
-      return "You're amazing " + user.getName() + ". Thanks for paying for this awesome software.";
+      return "You're amazing " + user + ". Thanks for paying for this awesome software.";
     }
 
     return "I suppose you can use this software.";
diff --git a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/user/User.java b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/user/User.java
index 732d06c61..12b4cc06e 100644
--- a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/user/User.java
+++ b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/user/User.java
@@ -8,7 +8,8 @@ public class User {
     this.name = name;
   }
 
-  public String getName() {
+  @Override
+  public String toString() {
     return name;
   }
 }
diff --git a/feature-toggle/src/test/java/com/iluwatar/featuretoggle/pattern/propertiesversion/PropertiesFeatureToggleVersionTest.java b/feature-toggle/src/test/java/com/iluwatar/featuretoggle/pattern/propertiesversion/PropertiesFeatureToggleVersionTest.java
new file mode 100644
index 000000000..de10480c3
--- /dev/null
+++ b/feature-toggle/src/test/java/com/iluwatar/featuretoggle/pattern/propertiesversion/PropertiesFeatureToggleVersionTest.java
@@ -0,0 +1,31 @@
+
+package com.iluwatar.featuretoggle.pattern.propertiesversion;
+
+import com.iluwatar.featuretoggle.pattern.Service;
+import com.iluwatar.featuretoggle.user.User;
+import org.junit.Test;
+
+import java.util.Properties;
+
+import static org.junit.Assert.assertEquals;
+
+public class PropertiesFeatureToggleVersionTest {
+
+  @Test
+  public void testFeatureTurnedOn() throws Exception {
+    final Properties properties = new Properties();
+    properties.put("enhancedWelcome",true);
+    Service service = new PropertiesFeatureToggleVersion(properties);
+    final String welcomeMessage = service.getWelcomeMessage(new User("Jamie No Code"));
+    assertEquals("Welcome Jamie No Code. You're using the enhanced welcome message.",welcomeMessage);
+  }
+
+  @Test
+  public void testFeatureTurnedOff() throws Exception {
+    final Properties properties = new Properties();
+    properties.put("enhancedWelcome",false);
+    Service service = new PropertiesFeatureToggleVersion(properties);
+    final String welcomeMessage = service.getWelcomeMessage(new User("Jamie No Code"));
+    assertEquals("Welcome to the application.",welcomeMessage);
+  }
+}
\ No newline at end of file