diff --git a/.classpath b/.classpath
index 2846539..ad20a19 100644
--- a/.classpath
+++ b/.classpath
@@ -8,7 +8,7 @@
 			<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">
+	<classpathentry exported="true" 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>
diff --git a/build/classes/.gitignore b/build/classes/.gitignore
index 4e7e508..710eab3 100644
--- a/build/classes/.gitignore
+++ b/build/classes/.gitignore
@@ -1 +1,3 @@
+/service/
+/testing/
 /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..ee44af7 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);
-		 * 
-		 * }
-		 */
+		
+		 
+		  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..78bd65c 100644
--- a/src/service/FlamesCheckService.java
+++ b/src/service/FlamesCheckService.java
@@ -1,9 +1,59 @@
 package service;
 
 // Create a class called FlamesCheckService
-// FlamesCheckService has a method findFlames to find the flames between two names
-// char findFlames(String name1, String name2) takes two strings as arguments
-// Your task is to calculate the flames value and return the corresponding character as output 
-// 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
+//FlamesCheckService has a method findFlames to find the flames between two names
+//char findFlames(String name1, String name2) takes two strings as arguments
+//Your task is to calculate the flames value and return the corresponding character as output 
+//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) {
+		
+		int total=name1.length()+name2.length();
+		int cancel=0;
+		for(int i=0;i<name1.length();i++) {
+			for(int j=0;j<name2.length();j++) {
+				if(name1.charAt(i)==name2.charAt(j)) {
+					++cancel;
+					name2=name2.substring(0,j)+name2.substring(j+1,name2.length());
+					break;
+				}
+			}
+		}
+		int cutting=total-(cancel*2);
+		String flames = "flames";
+        StringBuilder check = new StringBuilder(flames);
+        
+        char flameResult = 0;
+        
+        while(check.length()!=1)
+        {
+            int x = cutting%check.length(); 
+            String temp;
+            
+            if(x!=0)
+            {
+                temp = check.substring(x)+check.substring(0, x-1); // taking substring (counting purpose)
+                
+            }
+            else
+            {
+                temp = check.substring(0, check.length()-1); // taking substring (counting purpose)
+                
+            }
+            check = new StringBuilder(temp);
+           
+        }
+         flameResult = check.charAt(0);
+        return flameResult;
+ 
+ 
+       
+                
+        }
+	}
+
+
 
diff --git a/src/testing/TestFlamesCheckService.java b/src/testing/TestFlamesCheckService.java
index f3b45fe..22c64dc 100644
--- a/src/testing/TestFlamesCheckService.java
+++ b/src/testing/TestFlamesCheckService.java
@@ -8,30 +8,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();
+ 		}
+ 	}
 }