diff --git a/.classpath b/.classpath
index 2846539..20c137d 100644
--- a/.classpath
+++ b/.classpath
@@ -8,10 +8,6 @@
 			<attribute name="owner.project.facets" value="jst.web"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.8.0_241">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/build/classes/.gitignore b/build/classes/.gitignore
index 4e7e508..6423a15 100644
--- a/build/classes/.gitignore
+++ b/build/classes/.gitignore
@@ -1 +1,3 @@
+/testing/
+/service/
 /controller/
diff --git a/build/classes/controller/FlamesCheck.class b/build/classes/controller/FlamesCheck.class
index fe7152f..31b3204 100644
Binary files a/build/classes/controller/FlamesCheck.class and b/build/classes/controller/FlamesCheck.class differ
diff --git a/src/controller/FlamesCheck.java b/src/controller/FlamesCheck.java
index b9b9a0b..24f6b4d 100644
--- a/src/controller/FlamesCheck.java
+++ b/src/controller/FlamesCheck.java
@@ -13,6 +13,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import service.FlamesCheckService;
+
 
 
 @WebServlet("/flames")
@@ -33,35 +35,35 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
 	protected void doPost(HttpServletRequest request, HttpServletResponse response)
 			throws ServletException, IOException {
 
-		/*
-		 * Uncomment the below code to test your output 
-		 * String name1 = request.getParameter("your"); 
-		 * String name2 = request.getParameter("crush");
-		 * 
-		 * FlamesCheckService fcs = new FlamesCheckService();
-		 * 
-		 * char k = fcs.findFlames(name1,name2);
-		 * 
-		 * if (k == 'f') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/friends.jsp"
-		 * ); rd.forward(request, response);
-		 * 
-		 * } else if (k == 'l') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/lovers.jsp")
-		 * ; rd.forward(request, response);
-		 * 
-		 * } else if (k == 'a') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher(
-		 * "/WEB-INF/views/affection.jsp"); rd.forward(request, response);
-		 * 
-		 * } else if (k == 'm') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher(
-		 * "/WEB-INF/views/marriage.jsp"); rd.forward(request, response);
-		 * 
-		 * } else if (k == 'e') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/enemies.jsp"
-		 * ); rd.forward(request, response);
-		 * 
-		 * } else if (k == 's') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher(
-		 * "/WEB-INF/views/siblings.jsp"); rd.forward(request, response);
-		 * 
-		 * }
-		 */
+		
+		 // Uncomment the below code to test your output 
+		  String name1 = request.getParameter("your"); 
+		  String name2 = request.getParameter("crush");
+		  
+		  FlamesCheckService fcs = new FlamesCheckService();
+		  
+		  char k = fcs.findFlames(name1,name2);
+		  
+		  if (k == 'f') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/friends.jsp"
+		  ); rd.forward(request, response);
+		 
+		  } else if (k == 'l') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/lovers.jsp")
+		  ; rd.forward(request, response);
+		 
+		  } else if (k == 'a') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher(
+		  "/WEB-INF/views/affection.jsp"); rd.forward(request, response);
+		  
+		  } else if (k == 'm') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher(
+		  "/WEB-INF/views/marriage.jsp"); rd.forward(request, response);
+		  
+		  } else if (k == 'e') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher("/WEB-INF/views/enemies.jsp"
+		  ); rd.forward(request, response);
+		  
+		  } else if (k == 's') { RequestDispatcher rd=this.getServletContext().getRequestDispatcher(
+		  "/WEB-INF/views/siblings.jsp"); rd.forward(request, response);
+		 
+		  }
+		 
 	}
 
 }
diff --git a/src/service/FlamesCheckService.java b/src/service/FlamesCheckService.java
index a8c006a..604b059 100644
--- a/src/service/FlamesCheckService.java
+++ b/src/service/FlamesCheckService.java
@@ -7,3 +7,68 @@
 // You must return only the following values ['f','l','a','m','e','s']
 // change the return value at the end of the method corresponding to your return value
 
+
+public class FlamesCheckService{
+	public char findFlames(String name1, String name2)
+	{
+
+        StringBuffer str1 = new StringBuffer(name1);
+		StringBuffer str2 = new StringBuffer(name2);
+
+		///remove same charaters 
+		for (int i=0;i<str1.length();i++)
+		{
+			for (int j=0;j<str2.length();j++)
+			{
+				if(str1.charAt(i)==str2.charAt(j))
+				{
+					str1.setCharAt(i, '0');
+					str2.setCharAt(j, '0');
+					
+				}
+			}
+		}
+		String n1=str1.toString();
+		String n2=str2.toString();
+		
+		n1 =  n1.replaceAll("0","");
+		n2 = n2.replaceAll("0", "");
+		
+		//System.out.println(n1.length()+" "+n2.length());
+		int value = n1.length()+n2.length();
+        //System.out.println(value);
+        String flames = "flames";
+        StringBuilder sb3 = new StringBuilder(flames);
+        
+        char flameResult = 0;
+        
+        while(sb3.length()!=1)
+        {
+            int y = value%sb3.length(); 
+            String temp;
+            
+            if(y!=0)
+            {
+                temp = sb3.substring(y)+sb3.substring(0, y-1); 
+                
+            }
+            else
+            {
+                temp = sb3.substring(0, sb3.length()-1);
+                
+            }
+            sb3 = new StringBuilder(temp);
+           flameResult = sb3.charAt(0);
+            
+        }
+        return flameResult;
+
+		
+	}
+		
+	}
+
+
+	 
+	
+
diff --git a/src/testing/TestFlamesCheckService.java b/src/testing/TestFlamesCheckService.java
index f3b45fe..b076b2f 100644
--- a/src/testing/TestFlamesCheckService.java
+++ b/src/testing/TestFlamesCheckService.java
@@ -1,37 +1,37 @@
-package testing;
-
-import static org.junit.Assert.*;
-import org.junit.Test;
-
-import service.FlamesCheckService;
-
-public class TestFlamesCheckService {
-	FlamesCheckService fcs = new FlamesCheckService();
-	@Test
-// 	public void testFindFlamesMethod() {
-// 		String name1 = "Alex";
-// 		String name2 = "Joylin";
-// 		char temp = 'a';
-// 		assertEquals(temp,fcs.findFlames(name1, name2));
-// 		name1 = "Steffe";
-// 		name2 = "Bobby";
-// 		temp = 'm';
-// 		assertEquals(temp,fcs.findFlames(name1, name2));
-// 		name1 = "John";
-// 		name2 = "Jully";
-// 		temp = 'e';
-// 		assertEquals(temp,fcs.findFlames(name1, name2));
-// 		name1 = "George";
-// 		name2 = "Neythiri";
-// 		temp = 'l';
-// 	    assertEquals(temp,fcs.findFlames(name1, name2));
-// 		try {
-// 			fcs.findFlames(null, null);
-// 			fcs.findFlames("AAA", null);
-// 			fcs.findFlames(null, "BBB");
-// 		}
-// 		catch(Exception e) {
-// 			e.printStackTrace();
-// 		}
-// 	}
-}
+//package testing;
+//
+//import static org.junit.Assert.*;
+//import org.junit.Test;
+//
+//import service.FlamesCheckService;
+//
+//public class TestFlamesCheckService {
+//	FlamesCheckService fcs = new FlamesCheckService();
+//	@Test
+//// 	public void testFindFlamesMethod() {
+//// 		String name1 = "Alex";
+//// 		String name2 = "Joylin";
+//// 		char temp = 'a';
+//// 		assertEquals(temp,fcs.findFlames(name1, name2));
+//// 		name1 = "Steffe";
+//// 		name2 = "Bobby";
+//// 		temp = 'm';
+//// 		assertEquals(temp,fcs.findFlames(name1, name2));
+//// 		name1 = "John";
+//// 		name2 = "Jully";
+//// 		temp = 'e';
+//// 		assertEquals(temp,fcs.findFlames(name1, name2));
+//// 		name1 = "George";
+//// 		name2 = "Neythiri";
+//// 		temp = 'l';
+//// 	    assertEquals(temp,fcs.findFlames(name1, name2));
+//// 		try {
+//// 			fcs.findFlames(null, null);
+//// 			fcs.findFlames("AAA", null);
+//// 			fcs.findFlames(null, "BBB");
+//// 		}
+//// 		catch(Exception e) {
+//// 			e.printStackTrace();
+//// 		}
+//// 	}
+//}