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
deleted file mode 100644
index 4e7e508..0000000
--- a/build/classes/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/controller/
diff --git a/build/classes/controller/WebServelet.class b/build/classes/controller/WebServelet.class
new file mode 100644
index 0000000..ae094ef
Binary files /dev/null and b/build/classes/controller/WebServelet.class differ
diff --git a/build/classes/service/FlamesCheckService.class b/build/classes/service/FlamesCheckService.class
new file mode 100644
index 0000000..fa85fe7
Binary files /dev/null and b/build/classes/service/FlamesCheckService.class differ
diff --git a/build/classes/testing/TestFlamesCheckService.class b/build/classes/testing/TestFlamesCheckService.class
new file mode 100644
index 0000000..45bcb27
Binary files /dev/null and b/build/classes/testing/TestFlamesCheckService.class differ
diff --git a/src/controller/WebServelet.java b/src/controller/WebServelet.java
new file mode 100644
index 0000000..0a04874
--- /dev/null
+++ b/src/controller/WebServelet.java
@@ -0,0 +1,5 @@
+package controller;
+
+public class WebServelet {
+
+}
diff --git a/src/service/FlamesCheckService.java b/src/service/FlamesCheckService.java
index a8c006a..a0c30e4 100644
--- a/src/service/FlamesCheckService.java
+++ b/src/service/FlamesCheckService.java
@@ -1,9 +1,88 @@
 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
 
+
+import service.FlamesCheckService;
+
+// Create a class called FlamesCheckService
+public class FlamesCheckService {
+	public char findFlames(String name1, String name2) {
+		StringBuffer str1 = new StringBuffer(name1);
+		StringBuffer str2 = new StringBuffer(name2);
+		int len1 = str1.length();
+		int len2 = str2.length();
+		P: for (int i = 0; i < len1; i++)// label
+		{
+			char a = str1.charAt(i);
+
+			for (int j = 0; j < len2; j++) {
+				char b = str2.charAt(j);
+				if (a == b) {
+
+					str1.deleteCharAt(i);
+					str2.deleteCharAt(j);
+					len1 = str1.length();
+					len2 = str2.length();
+					i = 0;
+					j = 0;
+
+				}
+			}
+
+		}
+
+		int len = len1 + len2;
+		StringBuffer str3 = new StringBuffer("flames");
+		String str4 = new String();
+
+		P: for (int i = 0; i < 5; i++) {
+			int c = -1, d = 0, p = 0;
+
+			for (int j = 1; j <= len; j++) {
+				c++;
+				d++;
+
+				if (c > str3.length() - 1) {
+					char e = str3.charAt(p);
+					if (d == len) {
+						str3.deleteCharAt(p);
+
+						str4 = str3.substring(p, str3.length());
+
+						str3.delete(p, str3.length());
+
+						str3.insert(0, str4);
+
+						break;
+					} else {
+						p++;
+						if (p == str3.length()) {
+							p = 0;
+						}
+					}
+				} else {
+					char e = str3.charAt(c);
+					if (d == len) {
+						str3.deleteCharAt(c);
+
+						str4 = str3.substring(c, str3.length());
+
+						str3.delete(c, str3.length());
+
+						str3.insert(0, str4);
+
+						break;
+					}
+
+				}
+
+			}
+		}
+
+		char result = str3.charAt(0);
+		return result;
+
+	}
+
+}
\ No newline at end of file
diff --git a/src/testing/TestFlamesCheckService.java b/src/testing/TestFlamesCheckService.java
index f3b45fe..12ad4cb 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();
+ 		}
+ 	}
 }