diff --git a/Cipher.java b/Cipher.java
index 7527c5b..c0f8be7 100644
--- a/Cipher.java
+++ b/Cipher.java
@@ -15,7 +15,7 @@ public String encrypt(String inputString) {
         // for all chars in the input string
         for (int i = 0; i < inputString.length(); i++)   
         {
-
+            outputString += replaceChar (inputString.charAt(i), true);
         }
 
         return outputString;
@@ -26,7 +26,9 @@ public String decrypt(String inputString) {
         // output string will be collected in this variable, one char at a time
         String outputString = "";
         
-        replaceChar('a',true);
+        for ( int i = 0 ; i < inputString.length() ; i++){
+            outputString += replaceChar( inputString.charAt(i),false);
+        }
         
         return outputString;
     }
@@ -42,7 +44,7 @@ private char replaceChar(char inputChar, boolean isEncrypt) {
             for (int i = 0; i < ORIGINAL_ALPHABET.length(); i++)   
             {
                 if(ORIGINAL_ALPHABET.charAt(i) == inputChar) {
-
+                    return CIPHER_ALPHABET.charAt(i);
                 }
             }
         }
@@ -58,4 +60,4 @@ private char replaceChar(char inputChar, boolean isEncrypt) {
         // if we did not find it in the alphabet, then return the original char
         return inputChar;
     }
-}   
\ No newline at end of file
+}