diff --git a/adapter/etc/adapter.jpg b/adapter/etc/adapter.jpg
index 1843c638a..2e182515a 100644
Binary files a/adapter/etc/adapter.jpg and b/adapter/etc/adapter.jpg differ
diff --git a/adapter/src/main/java/com/iluwatar/App.java b/adapter/src/main/java/com/iluwatar/App.java
index 0fe30f455..f1c87c6e5 100644
--- a/adapter/src/main/java/com/iluwatar/App.java
+++ b/adapter/src/main/java/com/iluwatar/App.java
@@ -3,14 +3,15 @@ package com.iluwatar;
 /**
  * 
  * Adapter (GnomeEngineer) converts the interface of the
- * target class (GoblinGlider) into suitable one.
+ * target class (GoblinGlider) into suitable one expected
+ * by the client (GnomeEngineeringManager).
  *
  */
 public class App 
 {
     public static void main( String[] args )
     {
-    	GnomeEngineer engineer = new GnomeEngineer();
-    	engineer.operateDevice();
+    	GnomeEngineeringManager manager = new GnomeEngineeringManager();
+    	manager.operateDevice();
     }
 }
diff --git a/adapter/src/main/java/com/iluwatar/Engineer.java b/adapter/src/main/java/com/iluwatar/Engineer.java
index 4bce0e7d3..d8289df7d 100644
--- a/adapter/src/main/java/com/iluwatar/Engineer.java
+++ b/adapter/src/main/java/com/iluwatar/Engineer.java
@@ -2,8 +2,7 @@ package com.iluwatar;
 
 /**
  * 
- * The interface the client knows how
- * to use.
+ * Engineers can operate devices.
  *
  */
 public interface Engineer {
diff --git a/adapter/src/main/java/com/iluwatar/GnomeEngineer.java b/adapter/src/main/java/com/iluwatar/GnomeEngineer.java
index a35a85e41..92fc5aea8 100644
--- a/adapter/src/main/java/com/iluwatar/GnomeEngineer.java
+++ b/adapter/src/main/java/com/iluwatar/GnomeEngineer.java
@@ -2,9 +2,9 @@ package com.iluwatar;
 
 /**
  * 
- * Adapter class. Adapts the interface of the
- * GoblinGlider into Engineer expected by the
- * client.
+ * Adapter class. Adapts the interface of the device
+ * (GoblinGlider) into Engineer interface expected 
+ * by the client (GnomeEngineeringManager).
  *
  */
 public class GnomeEngineer implements Engineer {
diff --git a/adapter/src/main/java/com/iluwatar/GnomeEngineeringManager.java b/adapter/src/main/java/com/iluwatar/GnomeEngineeringManager.java
new file mode 100644
index 000000000..af3467d30
--- /dev/null
+++ b/adapter/src/main/java/com/iluwatar/GnomeEngineeringManager.java
@@ -0,0 +1,21 @@
+package com.iluwatar;
+
+/**
+ * 
+ * GnomeEngineering manager uses Engineer to
+ * operate devices.
+ *
+ */
+public class GnomeEngineeringManager implements Engineer {
+
+	private Engineer engineer;
+	
+	public GnomeEngineeringManager() {
+		engineer = new GnomeEngineer();
+	}
+	
+	@Override
+	public void operateDevice() {
+		engineer.operateDevice();
+	}
+}
diff --git a/adapter/src/main/java/com/iluwatar/GoblinGlider.java b/adapter/src/main/java/com/iluwatar/GoblinGlider.java
index 5a34dd70b..a5bcd0722 100644
--- a/adapter/src/main/java/com/iluwatar/GoblinGlider.java
+++ b/adapter/src/main/java/com/iluwatar/GoblinGlider.java
@@ -2,21 +2,20 @@ package com.iluwatar;
 
 /**
  * 
- * Adaptee class.
+ * Device class (adaptee in the pattern).
  *
  */
 public class GoblinGlider {
 
 	public void attachGlider() {
-		System.out.println("glider attached");
+		System.out.println("Glider attached.");
 	}
 	
 	public void gainSpeed() {
-		System.out.println("gaining speed");
+		System.out.println("Gaining speed.");
 	}
 	
 	public void takeOff() {
-		System.out.println("lift-off!");
+		System.out.println("Lift-off!");
 	}
-	
 }