diff --git a/features18/src/base64Changes/PasswordService.java b/features18/src/base64Changes/PasswordService.java
index a2c225e..49e6442 100644
--- a/features18/src/base64Changes/PasswordService.java
+++ b/features18/src/base64Changes/PasswordService.java
@@ -1,43 +1,136 @@
 package base64Changes;
+import java.util.*;
+// import java.security.MessageDigest;
+// import java.security.NoSuchAlgorithmException;
+// import java.util.Base64;
+// import java.util.Base64.Decoder;
+// import java.util.Base64.Encoder;
 
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Base64;
-import java.util.Base64.Decoder;
-import java.util.Base64.Encoder;
-
-public class PasswordService {
-	public static void main(String[] args) throws NoSuchAlgorithmException {
-		String pwd ="Mohan@0123";
-	Encoder encoder =	Base64.getEncoder();
+// public class PasswordService {
+// 	public static void main(String[] args) throws NoSuchAlgorithmException {
+// 		String pwd ="Mohan@0123";
+// 	Encoder encoder =	Base64.getEncoder();
 	
-	// converting string to byte[] and passing as input for encode() method
-	byte[] encode= encoder.encode(pwd.getBytes());
+// 	// converting string to byte[] and passing as input for encode() method
+// 	byte[] encode= encoder.encode(pwd.getBytes());
 	
 
-	//converting byte[] to string
-	String encodedpwd = new String(encode);
-	System.out.println(encodedpwd);
+// 	//converting byte[] to string
+// 	String encodedpwd = new String(encode);
+// 	System.out.println(encodedpwd);
 	
-	System.out.println("===============================");
+// 	System.out.println("===============================");
 	
-	Decoder decoder = Base64.getDecoder();
-	byte[] decode = decoder.decode(encodedpwd);
-	String decodedpwd = new String(decode);
-	System.out.println(decodedpwd);
+// 	Decoder decoder = Base64.getDecoder();
+// 	byte[] decode = decoder.decode(encodedpwd);
+// 	String decodedpwd = new String(decode);
+// 	System.out.println(decodedpwd);
 	
-	System.out.println("=================================");
-	// Encryption
-	String pwd1 ="Mohan@0123";
-	MessageDigest md = MessageDigest.getInstance("SHA-256");
-	byte[] digest = md.digest(pwd1.getBytes());
-	String encrypted = new String(digest);
-	System.out.println("Encripted :: "+encrypted);
+// 	System.out.println("=================================");
+// 	// Encryption
+// 	String pwd1 ="Mohan@0123";
+// 	MessageDigest md = MessageDigest.getInstance("SHA-256");
+// 	byte[] digest = md.digest(pwd1.getBytes());
+// 	String encrypted = new String(digest);
+// 	System.out.println("Encripted :: "+encrypted);
 	
-  Encoder encoder1 = Base64.getEncoder();
-  byte[] encode1=encoder1.encode(digest);
-  System.out.println("Encripted + Encoded ::" + new String(encode));
+//   Encoder encoder1 = Base64.getEncoder();
+//   byte[] encode1=encoder1.encode(digest);
+//   System.out.println("Encripted + Encoded ::" + new String(encode));
 	
-	}
+// 	}
+// }
+
+class PasswordService
+{
+    static void block(String []arr)
+    {
+        String BASE64="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+        String cipher="";
+        System.out.print("ciphertext: ");
+        for(int i=0;i<arr.length;i++)
+        {
+            int ascii=0;
+            int j=0;
+            int pow=0;
+            while(j<6)
+            {
+                char c=arr[i].charAt(j);
+                if(c=='1')
+                {
+                    ascii+=(int)Math.pow(2,5-j);
+                    pow++;
+                    j++;
+                }
+                else
+                {
+                    pow++;
+                    j++;
+                    continue;
+                }
+            }
+            
+            cipher+=BASE64.charAt(ascii); 
+        }
+        System.out.print(cipher);
+    }
+    public static void main(String s[]) 
+    {
+        base64_encode obj=new base64_encode();
+        Scanner input=new Scanner(System.in);
+        System.out.print("Enter something: ");
+        String plain=input.nextLine();
+        String combined_binary="";
+        int count=0;
+        int j=0;
+
+        for(int i=0;i<plain.length();i++)
+        {
+            String binary="";
+            int c=(int)plain.charAt(i);
+            binary+="";
+            while(c>0)
+            {
+            int rem=c%2;
+            binary=rem+binary;
+            c/=2;
+
+            }
+            while (binary.length() < 8) 
+            {
+                binary="0"+binary; 
+            }
+            System.out.print(binary+" ");
+            combined_binary+=binary;
+        }
+
+        
+
+        if(combined_binary.length()%6!=0)
+        {
+            while(combined_binary.length()%6!=0)
+            {
+                combined_binary+="0";
+            }
+        }
+        
+        String arr[]=new String[combined_binary.length()/6];
 
+        for(;count<combined_binary.length();)
+        {
+            String blockString="";
+            int i=0;
+            
+            while(i<6)
+            {
+                char c=combined_binary.charAt(count);
+                blockString+=c;
+                count++;
+                i++;
+            }
+            arr[j]=blockString;
+            j++;
+        }
+        block(arr);
+    }
 }