diff --git a/TemperatureConverter/src/com/example/i2at/tc/TemperatureConverter.java b/TemperatureConverter/src/com/example/i2at/tc/TemperatureConverter.java
index 0250447..17fd5c8 100644
--- a/TemperatureConverter/src/com/example/i2at/tc/TemperatureConverter.java
+++ b/TemperatureConverter/src/com/example/i2at/tc/TemperatureConverter.java
@@ -12,11 +12,12 @@ private TemperatureConverter() {
 		// do nothing
 	}
 	public static double fahrenheitToCelsius(double f) {
-		return 0.27777;
+		return ((f - 32) / 1.8);
 	}
 
 	public static double celsiusToFahrenheit(double c) {
-		return 32.5;
+
+		return ((c * 1.8) + 32);
 	}
 
 }
diff --git a/TemperatureConverter/src/com/example/i2at/tc/TemperatureConverterActivity.java b/TemperatureConverter/src/com/example/i2at/tc/TemperatureConverterActivity.java
index 965c486..bad6b3d 100644
--- a/TemperatureConverter/src/com/example/i2at/tc/TemperatureConverterActivity.java
+++ b/TemperatureConverter/src/com/example/i2at/tc/TemperatureConverterActivity.java
@@ -85,6 +85,7 @@ public void onTextChanged(CharSequence s, int start, int before,
                         + parsedNumber + "}");
                 // TODO: complete this method.
                 // Hint: use abstract method 'convert' and EditNumber.setNumber
+                mDest.setNumber(convert(parsedNumber));
                 
             } catch (NumberFormatException e) {
                 // WARNING:
@@ -130,9 +131,11 @@ public void onFocusChange(View dest, boolean hasFocus) {
             
             if (dest == mCelsius && ! Double.isNaN(f)) {
             	// TODO: complete this method. Use setNumber of EditNumber method
+            	mCelsius.setNumber(TemperatureConverter.fahrenheitToCelsius(f));
             }
             else if (dest == mFahrenheit && !Double.isNaN(c)) {
             	// TODO: complete this method. Use setNumber of EditNumber method
+            	mFahrenheit.setNumber(TemperatureConverter.celsiusToFahrenheit(c));
             }
         }
     };
diff --git a/TemperatureConverterTest/src/com/example/i2at/tc/test/TemperatureConverterActivityTests.java b/TemperatureConverterTest/src/com/example/i2at/tc/test/TemperatureConverterActivityTests.java
index 6cd5fad..41b0824 100644
--- a/TemperatureConverterTest/src/com/example/i2at/tc/test/TemperatureConverterActivityTests.java
+++ b/TemperatureConverterTest/src/com/example/i2at/tc/test/TemperatureConverterActivityTests.java
@@ -10,6 +10,7 @@
 import android.test.ViewAsserts;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.test.suitebuilder.annotation.Suppress;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.View;
@@ -96,7 +97,7 @@ public void testVirtualKeyboardSpaceReserved() {
     
     @UiThreadTest
     public void testFahrenheitToCelsiusConversion() {
-    	/* TODO 5-1: 하나의 field 에 값을 입력하면, 다른  field 에 해당 값이 실시간으로 변환되어야 함
+    	// TODO 5-1: 하나의 field 에 값을 입력하면, 다른  field 에 해당 값이 실시간으로 변환되어야 함
         mCelsius.clear();
         mFahrenheit.clear();
         final double f = 32.5;
@@ -106,11 +107,13 @@ public void testFahrenheitToCelsiusConversion() {
         assertTrue(mCelsius.requestFocus());
         assertTrue(mCelsius.isFocused());
         
-        final double expected; // COMPLETE 
-        final double actual; // COMPLETE
+        final double expected  = TemperatureConverter.fahrenheitToCelsius(f); 
+        final double actual = mCelsius.getNumber(); 
+        
+        Log.d("ttest","expected :" + expected +",actual :" + actual );
         final double delta = Math.abs(expected - actual);
         assertTrue("delta=" + delta + " expected=" + expected + " actual=" + actual, delta < 0.005);
-        */
+        
     	assertTrue(true);
     }