diff --git a/.idea/.name b/.idea/.name
index ec3551b..5406af0 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-RunningAppChecker
\ No newline at end of file
+Running-App-Checker
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 9a8b7e5..96cc43e 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
     <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="!?*.java" />
@@ -12,6 +11,7 @@
       <entry name="!?*.flex" />
       <entry name="!?*.kt" />
       <entry name="!?*.clj" />
+      <entry name="!?*.aj" />
     </wildcardResourcePatterns>
     <annotationProcessing>
       <profile default="true" name="Default" enabled="false">
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index bd4202c..8d2df47 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,9 +3,8 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="LOCAL" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.4" />
         <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index ce9de9a..e284b1d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,46 +3,6 @@
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
-    <option name="myNullables">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-        </list>
-      </value>
-    </option>
-  </component>
-  <component name="ProjectInspectionProfilesVisibleTreeState">
-    <entry key="Project Default">
-      <profile-state>
-        <expanded-state>
-          <State>
-            <id />
-          </State>
-        </expanded-state>
-        <selected-state>
-          <State>
-            <id>Abstraction issues</id>
-          </State>
-        </selected-state>
-      </profile-state>
-    </entry>
-  </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
     <OptionsSetting value="true" id="Remove" />
@@ -53,26 +13,10 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/app-release.apk b/app/app-release.apk
new file mode 100644
index 0000000..ba75445
Binary files /dev/null and b/app/app-release.apk differ
diff --git a/app/app.iml b/app/app.iml
index ea55d98..d58624d 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -24,7 +24,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
     <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
     <exclude-output />
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5b070f9..844f4f7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.mamahow.runningappchecker" >
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.WRITE_SETTINGS"></uses-permission>
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/java/com/mamahow/runningappchecker/BootUpReciever.java b/app/src/main/java/com/mamahow/runningappchecker/BootUpReciever.java
index bcf2050..8404c52 100644
--- a/app/src/main/java/com/mamahow/runningappchecker/BootUpReciever.java
+++ b/app/src/main/java/com/mamahow/runningappchecker/BootUpReciever.java
@@ -6,7 +6,7 @@
 import android.util.Log;
 
 /**
- * Created by tiggly on 6/29/15.
+ * Created by fangyu on 6/29/15.
  */
 
 public class BootUpReciever extends BroadcastReceiver{
diff --git a/app/src/main/java/com/mamahow/runningappchecker/MainActivity.java b/app/src/main/java/com/mamahow/runningappchecker/MainActivity.java
index dcafd38..7acc571 100644
--- a/app/src/main/java/com/mamahow/runningappchecker/MainActivity.java
+++ b/app/src/main/java/com/mamahow/runningappchecker/MainActivity.java
@@ -1,14 +1,23 @@
 package com.mamahow.runningappchecker;
 
+import android.content.ContentResolver;
+import android.provider.Settings;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.content.Intent;
+import android.os.PowerManager;
+import android.util.Log;
+import android.view.Window;
+import android.view.WindowManager;
+
 
 
 public class MainActivity extends AppCompatActivity {
 
     private static final String TAG = "RunningAppChecker";
 
+
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -22,5 +31,20 @@ protected void onCreate(Bundle savedInstanceState) {
         Intent startIntent = new Intent(this, MyService.class);
         startService(startIntent);
 
+        //Keep wakeup
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+
+//         final PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+//        this.mWakeLock = pm.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK, "My Tag");
+//        this.mWakeLock.acquire();
+
+
+
+    }
+
+    @Override
+    public void onDestroy() {
+
+        super.onDestroy();
     }
 }
diff --git a/app/src/main/java/com/mamahow/runningappchecker/MyService.java b/app/src/main/java/com/mamahow/runningappchecker/MyService.java
index 2de2f6d..5334240 100644
--- a/app/src/main/java/com/mamahow/runningappchecker/MyService.java
+++ b/app/src/main/java/com/mamahow/runningappchecker/MyService.java
@@ -10,9 +10,12 @@
 import java.util.List;
 import java.net.URL;
 
+import android.app.PendingIntent;
+import android.app.AlarmManager;
+import android.os.SystemClock;
 
 /**
- * Created by harryhow on 6/27/15.
+ * Created by fangyu on 6/27/15.
  */
 public class MyService extends Service{
 
@@ -22,7 +25,6 @@ public class MyService extends Service{
     public void onCreate() {
         super.onCreate();
         Log.d(TAG, "onCreate() executed");
-        //runningChecker();
         new RunningChecker().execute(null, null, null);
     }
 
@@ -30,7 +32,7 @@ public void onCreate() {
     public int onStartCommand(Intent intent, int flags, int startId) {
         Log.d(TAG, "onStartCommand() executed");
         new RunningChecker().execute(null, null, null);
-        // mamahow: you need to return START_STICKY to make sure service will restart without new intent
+        // fangyu: you need to return START_STICKY to make sure service will restart without new intent
         return START_STICKY;
     }
 
@@ -41,6 +43,20 @@ public void onDestroy() {
         Log.d(TAG, "onDestroy() executed");
     }
 
+    @Override
+    public void onTaskRemoved(Intent rootIntent){
+        Intent restartServiceIntent = new Intent(getApplicationContext(), this.getClass());
+        restartServiceIntent.setPackage(getPackageName());
+
+        PendingIntent restartServicePendingIntent = PendingIntent.getService(getApplicationContext(), 1, restartServiceIntent, PendingIntent.FLAG_ONE_SHOT);
+        AlarmManager alarmService = (AlarmManager) getApplicationContext().getSystemService(Context.ALARM_SERVICE);
+        alarmService.set(
+                AlarmManager.ELAPSED_REALTIME,
+                SystemClock.elapsedRealtime() + 1000,
+                restartServicePendingIntent);
+
+        super.onTaskRemoved(rootIntent);
+    }
 
     @Override
     public IBinder onBind(Intent intent) {
@@ -58,6 +74,7 @@ protected Long doInBackground(URL... urls) {
     private void _runningChecker() {
         int count = 0;
         while(true){
+            Log.i(TAG, "aaa");
             while(!isRunning()) {
                 count++;
 
@@ -72,7 +89,7 @@ private void _runningChecker() {
             }
             // delay
             try {
-                Thread.sleep(15000);
+                Thread.sleep(1000);
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
@@ -82,24 +99,20 @@ private void _runningChecker() {
     private boolean isRunning() {
         Context context = getBaseContext();
 
-        //Log.i(TAG, "Checking if app is running");
+        Log.i(TAG, "Checking if app is running");
         ActivityManager activityManager = (ActivityManager)context.getSystemService(Context.ACTIVITY_SERVICE);
         List<ActivityManager.RunningAppProcessInfo> services = activityManager.getRunningAppProcesses();
 
         boolean isForeground = false;
 
         for (int i=0; i<services.size(); i++){
-            //Log.i(TAG, "Name:" + services.get(i).processName.toString());
             // TODO: change package name for your own app
             if (services.get(i).processName.toString().equalsIgnoreCase("com.tiggly.tales")) {
-                //Log.i(TAG, "found my app!");
                 if (services.get(i).importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND){
-                    //Log.i(TAG, "App is on foreground, good!");
                     isForeground = true;
-
                     // delay
                     try {
-                        Thread.sleep(15000);
+                        Thread.sleep(1000);
                     } catch (InterruptedException e) {
                         e.printStackTrace();
                     }
@@ -110,67 +123,4 @@ private boolean isRunning() {
         return isForeground;
     }
 
-// Change to use Binder, using the following code
-//    class MyBinder extends Binder {
-//
-//        // Use AsyncTask or Runnable?
-//        public void runningChecker() {
-//            int count = 0;
-//            while(true){
-//                while(!isRunning()) {
-//                    count++;
-//                    Log.i(TAG, "App is NOT running, bring back my app again (" + count + ")");
-//
-//                    // invoke intent
-//                    Context context = getBaseContext();
-//                    // TODO: change package name for your own app
-//                    Intent intent = getPackageManager().getLaunchIntentForPackage("com.mamahow.helloandroidstudio");
-//
-//                    //Intent intent = new Intent(context, MainActivity.class);
-//                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK|Intent.FLAG_ACTIVITY_SINGLE_TOP);
-//                    startActivity(intent);
-//
-//                    try {
-//                        Thread.sleep(1000);
-//                    } catch (InterruptedException e) {
-//                        e.printStackTrace();
-//                    }
-//                    break;
-//                }
-//            }
-//         }
-//
-//        boolean isRunning() {
-//            Context context = getBaseContext();
-//
-//            //Log.i(TAG, "Checking if app is running");
-//            ActivityManager activityManager = (ActivityManager)context.getSystemService(Context.ACTIVITY_SERVICE);
-//            List<ActivityManager.RunningAppProcessInfo> services = activityManager.getRunningAppProcesses();
-//
-//
-//            boolean isForeground = false;
-//
-//            for (int i=0; i<services.size(); i++){
-//                //Log.i(TAG, "Name:" + services.get(i).processName.toString());
-//                // TODO: change package name for your own app
-//                if (services.get(i).processName.toString().equalsIgnoreCase("com.mamahow.helloandroidstudio")) {
-//                    //Log.i(TAG, "found my app!");
-//                    if (services.get(i).importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND){
-//                        Log.i(TAG, "App is on foreground, good!");
-//                        isForeground = true;
-//
-//                        // delay
-//                        try {
-//                            Thread.sleep(1000);
-//                        } catch (InterruptedException e) {
-//                            e.printStackTrace();
-//                        }
-//                    }
-//                 }
-//            }
-//
-//            return isForeground;
-//        }
-//    }
-
 }