diff --git a/includes/functions.php b/includes/functions.php
index 43631a4..b65801e 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -599,11 +599,13 @@ function SaveTORAndVPNConfig(){
 
   } elseif( isset($_POST['StartLokinet']) ) {
     exec( 'sudo /home/pi/loki-network/lokilaunch.sh "start" > /dev/null &', $return );
-    ?>
-    <div class="alert alert-success">
-        <strong>Starting Lokinet</strong>
-    </div>
-    <?php
+  //  ?>
+  //  <div class="alert alert-success">
+  //      <strong>Starting Lokinet</strong>
+  //  </div>
+  //  <?php
+  $status = '<div class="alert alert-warning alert-dismissable">Lokinet is starting
+        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
 
   } elseif( isset($_POST['StopLokinet']) ) {
     exec( 'sudo /home/pi/loki-network/lokilaunch.sh "stop" > /dev/null &', $return );
@@ -630,17 +632,5 @@ function SaveTORAndVPNConfig(){
     <?php
 
   }
-
-
-}
-exec( 'pidof lokinet | wc -l', $lokinetstatus);
-if( $lokinetstatus[0] == 0 ) {
-  $status = '<div class="alert alert-warning alert-dismissable">Lokinet daemon is not running
-        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
-} else {
-  $status = '<div class="alert alert-success alert-dismissable">Lokinet is running
-        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
 }
-sleep (5);
-echo $status;
 ?>