diff --git a/.classpath b/.classpath
index 2846539..ea8b998 100644
--- a/.classpath
+++ b/.classpath
@@ -1,17 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v9.0">
-		<attributes>
-			<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="output" path="build/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v9.0">
+		<attributes>
+			<attribute name="owner.project.facets" value="jst.web"/>
+		</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..73eb7ba 100644
--- a/build/classes/.gitignore
+++ b/build/classes/.gitignore
@@ -1 +1 @@
-/controller/
+/testing/
diff --git a/build/classes/controller/FlamesCheck.class b/build/classes/controller/FlamesCheck.class
index fe7152f..e56cd35 100644
Binary files a/build/classes/controller/FlamesCheck.class and b/build/classes/controller/FlamesCheck.class differ
diff --git a/build/classes/service/FlamesCheckService.class b/build/classes/service/FlamesCheckService.class
new file mode 100644
index 0000000..805a92a
Binary files /dev/null and b/build/classes/service/FlamesCheckService.class differ
diff --git a/src/controller/FlamesCheck.java b/src/controller/FlamesCheck.java
index b9b9a0b..a30f132 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,33 @@ 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);
-		 * 
-		 * }
-		 */
+		  String name2 = request.getParameter("crush");
+		  
+		  FlamesCheckService fcs = new FlamesCheckService();
+		  String name1 = request.getParameter("your"); 
+		  
+		  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..3cfd5db 100644
--- a/src/service/FlamesCheckService.java
+++ b/src/service/FlamesCheckService.java
@@ -7,3 +7,55 @@
 // 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 s1 = new StringBuffer(name1);
+		StringBuffer s2 = new StringBuffer(name2);
+		char c,d,e='\0';
+		for(int i=0;i<s1.length();i++) {
+			c=s1.charAt(i);
+			for(int j=0;j<s2.length();j++) {
+				d=s2.charAt(j);
+				if(c==d) {
+					s1.deleteCharAt(i);
+					s2.deleteCharAt(j);
+					i--;
+					j--;
+					break;
+				}
+			}
+		}
+		s1=s1.append(s2);
+		int k=6,l=0;
+		String s3="FLAMES";
+		while(k>1) {
+			for(int m=1;m<s1.length();m++) {
+				if(s3.charAt(l)!='X') {
+					l++;
+					if(l==6)
+					l=0;
+				}
+				else {
+					l++;
+					if(l==6)
+					l=0;
+					m--;
+				}
+			}
+			while(s3.charAt(l)=='X') {
+				l++;
+				if(l==6)
+				l=0;
+			}
+			s3=s3.substring(0,l)+"X"+s3.substring(l+1);
+			k--;
+		}
+		
+		for(int i=0;i<s3.length();i++) {
+			if(s3.charAt(i)!='X')
+			e=s3.charAt(i);
+		}
+		return Character.toLowerCase(e);
+	}
+}
\ No newline at end of file
diff --git a/src/testing/TestFlamesCheckService.java b/src/testing/TestFlamesCheckService.java
index f3b45fe..7649d90 100644
--- a/src/testing/TestFlamesCheckService.java
+++ b/src/testing/TestFlamesCheckService.java
@@ -1,6 +1,7 @@
 package testing;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+
 import org.junit.Test;
 
 import service.FlamesCheckService;
@@ -8,30 +9,30 @@
 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();
-// 		}
-// 	}
+ 	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();
+ 		}
+ 	}
 }