diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index 979deb4007..61c999b72d 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,3 +1,34 @@
+2011-02-01  Sergio Martin <sergio.martin@artica.es>
+
+	* android/AndroidManifest.xml
+	android/src/pandroid/agent/PandroidAgent.java
+	android/src/pandroid/agent/PandroidAgentTentacle.java
+	android/src/pandroid/agent/PandroidAgentListener.java
+	android/src/pandroid/agent/EventReceiver.java
+	android/bin/Pandroid Agent v0.3.apk
+	android/bin/pandroid/agent/PandroidAgentListener$MyLocationListener.class
+	android/bin/pandroid/agent/PandroidAgentListener$1.class
+	android/bin/pandroid/agent/PandroidAgent.class
+	android/bin/pandroid/agent/R$id.class
+	android/bin/pandroid/agent/PandroidAgentListener.class
+	android/bin/pandroid/agent/R$string.class
+	android/bin/pandroid/agent/tentacle_client.class
+	android/bin/pandroid/agent/R$layout.class
+	android/bin/pandroid/agent/PandroidAgent$1.class
+	android/bin/pandroid/agent/PandroidAgent$2.class
+	android/bin/pandroid/agent/EventReceiver.class
+	android/bin/pandroid/agent/PandroidAgent$3.class
+	android/bin/pandroid/agent/PandroidAgent$4.class
+	android/bin/pandroid/agent/PandroidAgent$5.class
+	android/bin/pandroid/agent/PandroidAgent$6.class
+	android/bin/pandroid/agent/PandroidAgent$7.class
+	android/bin/resources.ap_
+	android/bin/classes.dex
+	android/res/layout/main.xml
+	android/gen/pandroid/agent/R.java: Coded the heavy part of app to
+	background in a service and changed the way of do the contact from
+	loops to android alarms to fix the app sleep when screen off.
+
 2011-02-01  Junichi Satoh  <junichi@rworks.jp>
 
 	* unix/FreeBSD/pandora_agent.conf: Fixed invalid cpu usage data is
diff --git a/pandora_agents/android/AndroidManifest.xml b/pandora_agents/android/AndroidManifest.xml
index 395567ea79..0cb69e59c5 100755
--- a/pandora_agents/android/AndroidManifest.xml
+++ b/pandora_agents/android/AndroidManifest.xml
@@ -11,9 +11,11 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
+    	<service android:enabled="true" android:name="pandroid.agent.PandroidAgentListener" />
+		<receiver android:name="pandroid.agent.EventReceiver" />
     </application>
-<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission>
-<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"></uses-permission>
-<uses-permission android:name="android.permission.INTERNET"></uses-permission>
+    
+	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission>
+	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"></uses-permission>
+	<uses-permission android:name="android.permission.INTERNET"></uses-permission>
 </manifest> 
\ No newline at end of file
diff --git a/pandora_agents/android/bin/classes.dex b/pandora_agents/android/bin/classes.dex
index faa44a7156..7caa7306f8 100755
Binary files a/pandora_agents/android/bin/classes.dex and b/pandora_agents/android/bin/classes.dex differ
diff --git a/pandora_agents/android/bin/pandroid/agent/EventReceiver.class b/pandora_agents/android/bin/pandroid/agent/EventReceiver.class
new file mode 100644
index 0000000000..025752c9a7
Binary files /dev/null and b/pandora_agents/android/bin/pandroid/agent/EventReceiver.class differ
diff --git a/pandora_agents/android/bin/pandroid/agent/PandroidAgent$1.class b/pandora_agents/android/bin/pandroid/agent/PandroidAgent$1.class
index f0c021c1a1..398311ea03 100755
Binary files a/pandora_agents/android/bin/pandroid/agent/PandroidAgent$1.class and b/pandora_agents/android/bin/pandroid/agent/PandroidAgent$1.class differ
diff --git a/pandora_agents/android/bin/pandroid/agent/PandroidAgent$2.class b/pandora_agents/android/bin/pandroid/agent/PandroidAgent$2.class
index 377af30b99..8820bc37ec 100755
Binary files a/pandora_agents/android/bin/pandroid/agent/PandroidAgent$2.class and b/pandora_agents/android/bin/pandroid/agent/PandroidAgent$2.class differ
diff --git a/pandora_agents/android/bin/pandroid/agent/PandroidAgent$3.class b/pandora_agents/android/bin/pandroid/agent/PandroidAgent$3.class
index 3ef90a3800..c5aff10ae3 100755
Binary files a/pandora_agents/android/bin/pandroid/agent/PandroidAgent$3.class and b/pandora_agents/android/bin/pandroid/agent/PandroidAgent$3.class differ
diff --git a/pandora_agents/android/bin/pandroid/agent/PandroidAgent$4.class b/pandora_agents/android/bin/pandroid/agent/PandroidAgent$4.class
index 47137cd30d..7cf01dcfe0 100755
Binary files a/pandora_agents/android/bin/pandroid/agent/PandroidAgent$4.class and b/pandora_agents/android/bin/pandroid/agent/PandroidAgent$4.class differ
diff --git a/pandora_agents/android/bin/pandroid/agent/PandroidAgent$5.class b/pandora_agents/android/bin/pandroid/agent/PandroidAgent$5.class
index 3d8821d803..6887018452 100755
Binary files a/pandora_agents/android/bin/pandroid/agent/PandroidAgent$5.class and b/pandora_agents/android/bin/pandroid/agent/PandroidAgent$5.class differ
diff --git a/pandora_agents/android/bin/pandroid/agent/PandroidAgent$6.class b/pandora_agents/android/bin/pandroid/agent/PandroidAgent$6.class
index 07f5278612..bd456dbdf8 100755
Binary files a/pandora_agents/android/bin/pandroid/agent/PandroidAgent$6.class and b/pandora_agents/android/bin/pandroid/agent/PandroidAgent$6.class differ
diff --git a/pandora_agents/android/bin/pandroid/agent/PandroidAgent$7.class b/pandora_agents/android/bin/pandroid/agent/PandroidAgent$7.class
index d0de93a92f..000160c4ff 100755
Binary files a/pandora_agents/android/bin/pandroid/agent/PandroidAgent$7.class and b/pandora_agents/android/bin/pandroid/agent/PandroidAgent$7.class differ
diff --git a/pandora_agents/android/bin/pandroid/agent/PandroidAgent.class b/pandora_agents/android/bin/pandroid/agent/PandroidAgent.class
index 384d72e44a..00d3c7c0b6 100755
Binary files a/pandora_agents/android/bin/pandroid/agent/PandroidAgent.class and b/pandora_agents/android/bin/pandroid/agent/PandroidAgent.class differ
diff --git a/pandora_agents/android/bin/pandroid/agent/PandroidAgentListener.class b/pandora_agents/android/bin/pandroid/agent/PandroidAgentListener.class
new file mode 100644
index 0000000000..e787d82eb9
Binary files /dev/null and b/pandora_agents/android/bin/pandroid/agent/PandroidAgentListener.class differ
diff --git a/pandora_agents/android/bin/pandroid/agent/R$id.class b/pandora_agents/android/bin/pandroid/agent/R$id.class
index cf592991be..28443b89d8 100755
Binary files a/pandora_agents/android/bin/pandroid/agent/R$id.class and b/pandora_agents/android/bin/pandroid/agent/R$id.class differ
diff --git a/pandora_agents/android/bin/pandroid/agent/R$layout.class b/pandora_agents/android/bin/pandroid/agent/R$layout.class
index bbda245d46..f28c658f52 100755
Binary files a/pandora_agents/android/bin/pandroid/agent/R$layout.class and b/pandora_agents/android/bin/pandroid/agent/R$layout.class differ
diff --git a/pandora_agents/android/bin/pandroid/agent/R$string.class b/pandora_agents/android/bin/pandroid/agent/R$string.class
index 3c9e0d5e35..86eb33c3b2 100755
Binary files a/pandora_agents/android/bin/pandroid/agent/R$string.class and b/pandora_agents/android/bin/pandroid/agent/R$string.class differ
diff --git a/pandora_agents/android/bin/pandroid/agent/tentacle_client.class b/pandora_agents/android/bin/pandroid/agent/tentacle_client.class
index e56230890a..8d51dc09fb 100755
Binary files a/pandora_agents/android/bin/pandroid/agent/tentacle_client.class and b/pandora_agents/android/bin/pandroid/agent/tentacle_client.class differ
diff --git a/pandora_agents/android/bin/resources.ap_ b/pandora_agents/android/bin/resources.ap_
index 81062cf3fe..2126180050 100755
Binary files a/pandora_agents/android/bin/resources.ap_ and b/pandora_agents/android/bin/resources.ap_ differ
diff --git a/pandora_agents/android/gen/pandroid/agent/R.java b/pandora_agents/android/gen/pandroid/agent/R.java
index 3b9fe54a43..338e15cd5c 100755
--- a/pandora_agents/android/gen/pandroid/agent/R.java
+++ b/pandora_agents/android/gen/pandroid/agent/R.java
@@ -22,19 +22,16 @@ public final class R {
         public static final int field3=0x7f050009;
         public static final int field4=0x7f05000b;
         public static final int fieldSummary=0x7f050003;
-        public static final int groupRadioGpsReport=0x7f05000e;
         public static final int header=0x7f050001;
         public static final int intervalInput=0x7f05000a;
         public static final int lastContactInfo=0x7f050004;
         public static final int logo=0x7f050002;
-        public static final int radioGpsCurrent=0x7f050010;
-        public static final int radioGpsLast=0x7f05000f;
-        public static final int reset=0x7f050012;
+        public static final int reset=0x7f05000f;
         public static final int serverAddrInput=0x7f050006;
         public static final int serverPortInput=0x7f050008;
         public static final int title=0x7f050000;
-        public static final int update=0x7f050011;
-        public static final int xml=0x7f050013;
+        public static final int update=0x7f05000e;
+        public static final int xml=0x7f050010;
     }
     public static final class layout {
         public static final int main=0x7f030000;
diff --git a/pandora_agents/android/res/layout/main.xml b/pandora_agents/android/res/layout/main.xml
index 75e13bc667..e106a4bc3d 100755
--- a/pandora_agents/android/res/layout/main.xml
+++ b/pandora_agents/android/res/layout/main.xml
@@ -117,30 +117,10 @@ android:orientation="vertical">
 	android:textColor="#bbbbbb"
 	>
 </CheckBox>
-<RadioGroup android:layout_width="fill_parent"
-		android:layout_height="wrap_content" 
-		android:padding="15dp"
-		android:orientation="vertical"
-		android:id="@+id/groupRadioGpsReport"
-		android:layout_below="@id/checkGpsReport" >
-    <RadioButton android:checked="false"
-            android:text="@string/gpsLast" 
-            android:id="@+id/radioGpsLast"
-            android:textSize="14dip"
-            android:textColor="#bbbbbb"
-             />
-    <RadioButton android:checked="false"
-            android:text="@string/gpsCurrent" 
-            android:id="@+id/radioGpsCurrent"
-            android:textSize="14dip"
-            android:textColor="#bbbbbb"
-            android:visibility="gone"
-             />
-</RadioGroup>
 <Button android:id="@+id/update" 
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_below="@id/groupRadioGpsReport"
+    android:layout_below="@id/checkGpsReport"
     android:layout_alignParentRight="true"
     android:gravity="right"
     android:text="@string/update"
diff --git a/pandora_agents/android/src/pandroid/agent/EventReceiver.java b/pandora_agents/android/src/pandroid/agent/EventReceiver.java
new file mode 100644
index 0000000000..97250da8e8
--- /dev/null
+++ b/pandora_agents/android/src/pandroid/agent/EventReceiver.java
@@ -0,0 +1,14 @@
+package pandroid.agent;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+public class EventReceiver extends BroadcastReceiver {
+
+ @Override
+ public void onReceive(Context context, Intent intent) {
+	 context.startService(new Intent(context, PandroidAgentListener.class));
+ }
+
+}
\ No newline at end of file
diff --git a/pandora_agents/android/src/pandroid/agent/PandroidAgent.java b/pandora_agents/android/src/pandroid/agent/PandroidAgent.java
index ea81e99fe8..acecd98bf8 100755
--- a/pandora_agents/android/src/pandroid/agent/PandroidAgent.java
+++ b/pandora_agents/android/src/pandroid/agent/PandroidAgent.java
@@ -1,13 +1,13 @@
 package pandroid.agent;
 
 import android.app.Activity;
+import android.app.AlarmManager;
+import android.app.PendingIntent;
 import android.os.Bundle;
 import android.widget.TextView;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.Button;
-import android.widget.RadioGroup;
-import android.widget.RadioButton;
 import android.os.Handler;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -16,23 +16,13 @@ import android.view.KeyEvent;
 import android.view.inputmethod.InputMethodManager;
 import android.location.Location;
 import android.location.LocationListener;
-import android.location.LocationManager;
-import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.SharedPreferences;
-import android.widget.Toast;
+import android.content.ComponentName;
 import android.graphics.Color;
 
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.FileOutputStream;
-import java.io.FileInputStream;
 import java.util.Date;
-import java.util.Calendar;
-import java.util.List;
 import java.lang.Thread;
 
 public class PandroidAgent extends Activity {
@@ -42,64 +32,55 @@ public class PandroidAgent extends Activity {
     String defaultServerPort = "41121";
     String defaultServerAddr = "10.0.2.2";
     String defaultAgentName = "pandroidAgent";
-    String defaultGpsMode = "last"; // "last" or "current"
     String defaultGpsStatus = "disabled"; // "disabled" or "enabled"
     
     boolean showLastXML = true;
-    boolean contactError = false;
     
     String lastGpsContactDateTime = "";
     Thread thread = new Thread();
+    ComponentName service = null;
+    PendingIntent sender = null;
+    AlarmManager am = null;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {	
         super.onCreate(savedInstanceState);
         this.setContentView(R.layout.main);
         
-//        defaultGpsMode = "last";
-//        String gpsMode = getSharedData("PANDROID_DATA", "gpsMode", defaultGpsMode, "string");
-//
-//        if(gpsMode.equals(gpsMode)) {
-//		    LocationManager mlocManager = (LocationManager)getSystemService(Context.LOCATION_SERVICE);
-//		    LocationListener mlocListener = new MyLocationListener();
-//		         //Use the LocationManager class to obtain GPS locations
-//	        mlocManager.requestLocationUpdates( 
-//	        		LocationManager.GPS_PROVIDER, 
-//	        		0, // minTime in ms 
-//	        		0, // minDistance in meters
-//		        		mlocListener);
-//        }
-        
         //resetValues();
         
-        initViews();
-        
-        updateConf();
-        
+        // Load the stored data into views
+        loadViews();
+                
+        // Set the cleaning returns listener
         setCleanReturns();
         
+        // Set the button events listener
         setButtonEvents();
         
-        thread = new Thread(null, BGProcess, "Background");
-        thread.start();
-    }
-    
-    private Runnable BGProcess = new Runnable() {
-    	public void run() {
-    		backGroundOpps();
-    	}
-    };
-    
-    private void backGroundOpps() {
+        // Start the agent listener service
+		//ComponentName service = startService(new Intent(this, PandroidAgentListener.class));
+		
+		// Setting an alarm to call service
+        Intent intentReceiver = new Intent(this, EventReceiver.class);
+        sender = PendingIntent.getBroadcast(this, 0, intentReceiver, 0);
+        
+        am = (AlarmManager) getSystemService(ALARM_SERVICE);
+        
+        // Start the alert listener
+		startAgentListener();
+
+		// Update the UI each second
         h.post(new Runnable() {
         	@Override
         	public void run() {
-        		updateLastContact();
+        		updateUI();
         		h.postDelayed(this, 1000);
         	}
         });
     }
     
+    
     private void putSharedData(String preferenceName, String tokenName, String data, String type) {
 		int mode = Activity.MODE_PRIVATE;
 		SharedPreferences agentPreferences = getSharedPreferences(preferenceName, mode);
@@ -177,6 +158,19 @@ public class PandroidAgent extends Activity {
 	            return false;
 	        }
 	    });
+	    
+	    EditText serverPortInput = (EditText) findViewById(R.id.serverPortInput);
+	    serverPortInput.setOnKeyListener(new OnKeyListener() {
+	        public boolean onKey(View v, int keyCode, KeyEvent event) {
+	            if(keyCode == 66) {
+	        	    EditText serverPortInput = (EditText) findViewById(R.id.serverPortInput);
+	        	    if(serverPortInput.getText().toString().length() > 0) {
+	        	    	serverPortInput.setText(serverPortInput.getText().toString().replaceAll("[\\r\\n]", ""));
+	        	    }
+	            }
+	            return false;
+	        }
+	    });
 	   
 	    EditText agentNameInput = (EditText) findViewById(R.id.agentNameInput);
 	    agentNameInput.setOnKeyListener(new OnKeyListener() {
@@ -198,10 +192,9 @@ public class PandroidAgent extends Activity {
         
         updateButton.setOnClickListener(new OnClickListener() {
         	public void onClick(View view) { 
-        		contactError = false;
         	    updateConf();
-        	    contact();
-        		updateLastContact();
+        	    updateUI();
+				restartAgentListener();
         		hideKeyboard();
         	}
         });
@@ -212,8 +205,9 @@ public class PandroidAgent extends Activity {
         resetButton.setOnClickListener(new OnClickListener() {
         	public void onClick(View view) {
         	    resetValues();
-        		initViews();
+        		loadViews();
         		updateConf();
+        		restartAgentListener();
         	    hideKeyboard();
         	}
         });
@@ -226,25 +220,7 @@ public class PandroidAgent extends Activity {
 //        	    thread.stop();
 //        	}
 //        });
-        
-        CheckBox checkGpsReport = (CheckBox) findViewById(R.id.checkGpsReport);
-        
-        checkGpsReport.setOnClickListener(new OnClickListener() {
-        	public void onClick(View view) {
-                CheckBox checkGpsReport = (CheckBox) findViewById(R.id.checkGpsReport);
-	            RadioGroup gpsRadio = (RadioGroup) findViewById(R.id.groupRadioGpsReport);
-
-    	        if(checkGpsReport.isChecked()) {
-    	        	gpsRadio.setVisibility(gpsRadio.VISIBLE);
-    	        	putSharedData("PANDROID_DATA", "gpsStatus", "enabled", "string");
-    	        }
-    	        else {
-    	        	gpsRadio.setVisibility(gpsRadio.GONE);
-    	        	putSharedData("PANDROID_DATA", "gpsStatus", "disabled", "string");
-    	        }
-        	}
-        });
-        
+                
 	}
 	
 	private void resetValues() {
@@ -255,7 +231,6 @@ public class PandroidAgent extends Activity {
 		putSharedData("PANDROID_DATA", "latitude", "181", "float");
 		putSharedData("PANDROID_DATA", "longitude", "181", "float");
 		putSharedData("PANDROID_DATA", "gpsStatus", defaultGpsStatus, "string");
-		putSharedData("PANDROID_DATA", "gpsMode", defaultGpsMode, "string");
 		putSharedData("PANDROID_DATA", "lastContact", "-1", "long");
 	}
 	
@@ -278,21 +253,13 @@ public class PandroidAgent extends Activity {
 
 	    CheckBox checkGpsReport = (CheckBox) findViewById(R.id.checkGpsReport);
 	    
-	    String gpsMode = "Disabled";
 	    if(checkGpsReport.isChecked()) {
-	        RadioButton radioGpsLast = (RadioButton) findViewById(R.id.radioGpsLast);
-	        if(radioGpsLast.isChecked()) {
-	        	putSharedData("PANDROID_DATA", "gpsMode", "last", "string");
-	        	gpsMode = "Last position";
-	        }
-	        else {
-	        	putSharedData("PANDROID_DATA", "gpsMode", "current", "string");
-	        	gpsMode = "Current position";
-	        }
+	        putSharedData("PANDROID_DATA", "gpsStatus", "enabled", "string");
+	    }
+	    else {
+	        putSharedData("PANDROID_DATA", "gpsStatus", "disabled", "string");
 	    }
         
-		TextView summary = (TextView) this.findViewById(R.id.fieldSummary);
-		summary.setText("Server: " + serverAddr + "\nPort: " + serverPort + "\nInterval: " + interval + " seconds\nAgent name: " + agentName + "\nGPS Mode: " + gpsMode);
 	}
 	
 	private void hideKeyboard() {
@@ -301,38 +268,18 @@ public class PandroidAgent extends Activity {
 		imm.hideSoftInputFromWindow(serverAddrInput.getWindowToken(), 0);
 	}
 	
-	private void updateLastContact(){
-		//long lastContact = Long.parseLong("5");
-		long lastContact = Long.parseLong(getSharedData("PANDROID_DATA", "lastContact", "-1", "long"));
-
-		if(lastContact == -1) {
-	        contact();
-		}
+	private void updateUI() {
+		// Update connection data summary
+		updateSummary();
 		
-		updateValues();
+		// Update the last contact info
+		updateLastContactInfo();
 		
-        Date date = new Date();
-        long timestamp = date.getTime() / 1000;
-        long timeAgo = timestamp - lastContact;
-        
-		int interval = Integer.parseInt(getSharedData("PANDROID_DATA", "interval", Integer.toString(defaultInterval), "integer"));
-
-        if(timeAgo >= interval) {
-        	contact();
-        	timeAgo = 0;
-        }
-        
-        if(contactError) {
-        	changeContactInfo("Contact error", "#FF0000");
-        }
-        else {
-        	String stringAgo = timeAgo + " seconds ago.";
-        	if(timeAgo == 0) {
-        		stringAgo = "Now.";
-        	}
-        	changeContactInfo("Last Contact: " + stringAgo, "#00FF00");
-        }
-        
+		// Update the last XML sended info
+		updateLastXML();
+	}
+	
+	private void updateLastXML() {
 		TextView xml = (TextView) this.findViewById(R.id.xml);
 		if(showLastXML) {
 			String lastXML = getSharedData("PANDROID_DATA", "lastXML", "[no data]", "string");
@@ -343,6 +290,60 @@ public class PandroidAgent extends Activity {
 		}
 	}
 	
+	private void stopAgentListener() {
+	    am.cancel(sender);
+	}
+	
+	private void startAgentListener() {
+		int interval = Integer.parseInt(getSharedData("PANDROID_DATA", "interval", Integer.toString(defaultInterval), "integer"));
+
+        // Set the alarm with the interval frequency
+        am.setRepeating(AlarmManager.RTC, System.currentTimeMillis(), (interval * 1000), sender);
+	}
+	
+	private void restartAgentListener() {
+		stopAgentListener();
+		startAgentListener();
+	}
+	
+	private void updateLastContactInfo() {
+		//putSharedData("PANDROID_DATA", "lastContact", "-1", "long");
+		long lastContact = Long.parseLong(getSharedData("PANDROID_DATA", "lastContact", "-1", "long"));
+		int contactError = Integer.parseInt(getSharedData("PANDROID_DATA", "contactError", "0", "integer"));
+
+        Date date = new Date();
+        long timestamp = date.getTime() / 1000;
+        long timeAgo = -1;
+        if(lastContact != -1){
+            timeAgo = timestamp - lastContact;
+        }
+        
+		int interval = Integer.parseInt(getSharedData("PANDROID_DATA", "interval", Integer.toString(defaultInterval), "integer"));
+
+        if(timeAgo >= interval) {
+        	timeAgo = 0;
+        }
+        
+    	String stringAgo = "";
+    	
+    	if(lastContact == -1) {
+    		stringAgo = "Never.";
+    	}
+    	else if(timeAgo == 0) {
+    		stringAgo = "Now.";
+    	}
+    	else {
+        	stringAgo = timeAgo + " seconds ago.";
+    	}
+    	
+        if(contactError == 1) {
+        	changeContactInfo("Contact error", "#FF0000");
+        }
+        else {
+        	changeContactInfo("Last Contact: " + stringAgo, "#00FF00");
+        }
+	}
+	
 	private void changeContactInfo(String msg, String colorCode) {
 		TextView lastContactInfo = (TextView) this.findViewById(R.id.lastContactInfo);
 		lastContactInfo.setTextColor(Color.parseColor(colorCode));
@@ -350,31 +351,19 @@ public class PandroidAgent extends Activity {
 		
 	}
 	
-	private void updateSharedData() {
-		TextView summary = (TextView) this.findViewById(R.id.fieldSummary);
+	private void updateSummary() {
 		String serverAddr = getSharedData("PANDROID_DATA", "serverAddr", "[no data]", "string");
 		String serverPort = getSharedData("PANDROID_DATA", "serverPort", "[no data]", "string");
 		String interval = getSharedData("PANDROID_DATA", "interval", "300", "integer");
 		String agentName = getSharedData("PANDROID_DATA", "agentName", "[no data]", "string");
-		summary.setText("Server: " + serverAddr + "\nPort: " + serverPort + "\nInterval: " + interval + "\nAgent name: " + agentName);
+		String gpsStatus = getSharedData("PANDROID_DATA", "gpsStatus", "[no data]", "string");
+	
+		// Update the connection summary
+		TextView summary = (TextView) this.findViewById(R.id.fieldSummary);
+		summary.setText("Server: " + serverAddr + "\nPort: " + serverPort + "\nInterval: " + interval + " seconds\nAgent name: " + agentName + "\nGPS Report: " + gpsStatus);	
 	}
 	
-	private void contact(){
-        Date date = new Date();
-        
-        putSharedData("PANDROID_DATA", "lastContact", Long.toString(date.getTime() / 1000), "long");
-        
-        // Keep lastXML sended if is not empty (empty means error sending it)
-        String lastXML = buildXML();
-
-        if(!lastXML.equals("")) {
-            putSharedData("PANDROID_DATA", "lastXML", lastXML, "string");
-        }
-        
-		updateValues();
-	}
-	
-	private void initViews(){
+	private void loadViews(){
         // Init form values
 	    EditText serverAddrInput = (EditText) findViewById(R.id.serverAddrInput);
         serverAddrInput.setText(getSharedData("PANDROID_DATA", "serverAddr", defaultServerAddr, "string"));
@@ -394,264 +383,7 @@ public class PandroidAgent extends Activity {
         String gpsStatus = getSharedData("PANDROID_DATA", "gpsStatus", defaultGpsStatus, "string");
         boolean gpsEnabled = gpsStatus.equals("enabled");
         checkGpsReport.setChecked(gpsEnabled);
-        
-        RadioGroup gpsRadio = (RadioGroup) findViewById(R.id.groupRadioGpsReport);
 
-        if(gpsEnabled) {
-	        gpsRadio.setVisibility(gpsRadio.VISIBLE);
-        }
-        else {
-	        gpsRadio.setVisibility(gpsRadio.GONE);
-        }
-        
-        RadioButton radioGpsCurrent = (RadioButton) findViewById(R.id.radioGpsCurrent);
-        RadioButton radioGpsLast = (RadioButton) findViewById(R.id.radioGpsLast);
-
-	        	
-        if(getSharedData("PANDROID_DATA", "gpsMode", defaultGpsMode, "string").equals("current")) {
-        	radioGpsCurrent.setChecked(true);
-        }
-        else {
-        	radioGpsLast.setChecked(true);
-        }
-
-        updateValues();
 	}
 	
-	private String buildXML(){
-		String buffer = "";
-		String gpsData = "";
-		buffer += "<?xml version='1.0' encoding='utf-8'?>\n";
-		
-		String latitude = getSharedData("PANDROID_DATA", "latitude", "181", "float");
-		String longitude = getSharedData("PANDROID_DATA", "longitude", "181", "float");
-
-		if(!latitude.equals("181.0") && !longitude.equals("181.0")) {
-			gpsData = " latitude='" + latitude + "' longitude='" + longitude + "'";
-		}
-		
-		String agentName = getSharedData("PANDROID_DATA", "agentName", defaultAgentName, "string");
-		String interval = getSharedData("PANDROID_DATA", "interval", Integer.toString(defaultInterval), "integer");
-		
-		buffer += "<agent_data description='' group='' os_name='android' os_version='2.1' interval='"+ interval +"' version='3.2RC1(Build 101103)' timestamp='" + getHumanDateTime(-1) + "' agent_name='" + agentName + "' timezone_offset='0'" + gpsData +">\n";
-		
-		// Modules
-		buffer += buildmoduleXML("battery_level", "The actually device battery level", "generic_data", getSharedData("PANDROID_DATA", "batteryLevel", "-1", "integer"));		
-		//buffer += buildmoduleXML("last_gps_contact", "Datetime of the last geo-location contact", "generic_data", lastGpsContactDateTime);
-		
-		// End_Modules
-		
-		buffer += "</agent_data>";
-		
-		String destFileName = agentName + "." + System.currentTimeMillis() + ".data";
-		
-		writeFile(destFileName, buffer);
-
-		String[] tentacleData = {
-				  "-a",
-				  getSharedData("PANDROID_DATA", "serverAddr", "", "string"),
-				  "-p",
-				  defaultServerPort,
-				  "-v",
-				  "/data/data/pandroid.agent/files/" + destFileName
-	    		  };
-
-		int tentacleRet = new tentacle_client().tentacle_client(tentacleData);
-		
-		if(tentacleRet == 0) {
-			contactError = false;
-		}
-		else {
-			contactError = true;
-			buffer = "";
-		}
-		
-		return buffer;
-	}
-	
-	
-	private String buildmoduleXML(String name, String description, String type, String data){
-		String buffer = "";
-		buffer += "  <module>\n";
-		buffer += "    <name><![CDATA[" + name + "]]></name>\n";
-		buffer += "    <description><![CDATA[" + description + "]]></description>\n";
-		buffer += "    <type><![CDATA[" + type + "]]></type>\n";
-		buffer += "    <data><![CDATA[" + data + "]]></data>\n";
-		buffer += "  </module>\n";
-		
-		return buffer;
-	}
-	
-	////////////////////////////////////////////////////////////
-	// Get human date time from unixtime in milliseconds. 
-	// If unixtime = -1 is returned the current datetime
-	////////////////////////////////////////////////////////////
-    private String getHumanDateTime(long unixtime){
-        Calendar dateTime = Calendar.getInstance();
-        if(unixtime != -1) {
-        	dateTime.setTimeInMillis(unixtime);
-        }
-        String humanDateTime;
-        
-        humanDateTime = dateTime.get(Calendar.YEAR) + "/";
-        
-        int month = dateTime.get(Calendar.MONTH) + 1;
-        if(month < 10) {
-        	humanDateTime += "0";
-        }
-    	humanDateTime += month + "/";
-
-    	int day = dateTime.get(Calendar.DAY_OF_MONTH);
-        if(day < 10) {
-        	humanDateTime += "0";
-        }
-    	humanDateTime += day + " ";
-    	
-    	int hour = dateTime.get(Calendar.HOUR_OF_DAY);
-        if(hour < 10) {
-        	humanDateTime += "0";
-        }
-    	humanDateTime += hour + ":";
-    	
-    	int minute = dateTime.get(Calendar.MINUTE);
-        if(minute < 10) {
-        	humanDateTime += "0";
-        }
-    	humanDateTime += minute + ":";
-        
-    	int second = dateTime.get(Calendar.SECOND);
-        if(second < 10) {
-        	humanDateTime += "0";
-        }
-    	humanDateTime += second;
-    	
-        return humanDateTime;
-    }
-    
-    
-    private void showToast (String msg) {
-    	Context context = getApplicationContext();
-    	int duration = Toast.LENGTH_SHORT;
-
-    	Toast toast = Toast.makeText(context, msg, duration);
-    	toast.show();
-    }
-    
-    ///////////////////////////////////////////
-    // Getting values from device functions
-    ///////////////////////////////////////////
-    
-    private void gpsLocation() {
-    	// Starts with GPS, if no GPS then gets network location
-    	
-		LocationManager lm = (LocationManager) getSystemService(Context.LOCATION_SERVICE);  
-		List<String> providers = lm.getProviders(true);
-
-		/* Loop over the array backwards, and if you get an accurate location, then break out the loop*/
-		Location loc = null;
-
-		for (int i=providers.size()-1; i>=0; i--) {
-		    loc = lm.getLastKnownLocation(providers.get(i));
-		    if (loc != null) break;
-		}
-
-		if (loc != null) {
-			//if(latitude != loc.getLatitude() || longitude != loc.getLongitude()) {
-				lastGpsContactDateTime = getHumanDateTime(-1);
-			//}
-            putSharedData("PANDROID_DATA", "latitude", new Double(loc.getLatitude()).toString(), "float");
-            putSharedData("PANDROID_DATA", "longitude", new Double(loc.getLongitude()).toString(), "float");
-		}
-		else {             
-            putSharedData("PANDROID_DATA", "latitude", "181", "float");
-            putSharedData("PANDROID_DATA", "longitude", "181", "float");
-		}
-		
-    }
-    
-    private void batteryLevel() {
-        BroadcastReceiver batteryLevelReceiver = new BroadcastReceiver() {
-            public void onReceive(Context context, Intent intent) {
-                context.unregisterReceiver(this);
-                int rawlevel = intent.getIntExtra("level", -1);
-                int scale = intent.getIntExtra("scale", -1);
-                if (rawlevel >= 0 && scale > 0) {
-                    putSharedData("PANDROID_DATA", "batteryLevel", new Integer((rawlevel * 100) / scale).toString(), "integer");
-                }
-            }
-        };
-        IntentFilter batteryLevelFilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
-        registerReceiver(batteryLevelReceiver, batteryLevelFilter);
-    }
-
-	private void updateValues() {
-        batteryLevel();
-        String gpsMode = getSharedData("PANDROID_DATA", "gpsMode", defaultGpsMode, "string");
-        
-        if(gpsMode.equals("last")) {
-			gpsLocation();
-        }
-	}
-    
-    private void writeFile(String fileName, String textToWrite) {
-    	try { // catches IOException below
-    	                        FileOutputStream fOut = openFileOutput(fileName,
-    	                                                                MODE_WORLD_READABLE);
-    	                        OutputStreamWriter osw = new OutputStreamWriter(fOut); 
-    	 
-    	                        // Write the string to the file
-    	                        osw.write(textToWrite);
-    	                        /* ensure that everything is
-    	                         * really written out and close */
-    	                        osw.flush();
-    	                        osw.close();
-    	} catch (IOException e) {
-
-    	}
-
-    }
-    
-    private String readFile(String fileName) {
-    	String readString = "";
-    	try { // catches IOException below
-    		      FileInputStream fIn = openFileInput(fileName);
-                  InputStreamReader isr = new InputStreamReader(fIn);
-                  /* Prepare a char-Array that will
-                   * hold the chars we read back in. */
-                  char[] inputBuffer = new char[100];
-                  // Fill the Buffer with data from the file
-                  isr.read(inputBuffer);
-                  // Transform the chars to a String
-                  readString = new String(inputBuffer);
-
-	          } catch (IOException ioe) {
-	          }
-	          
-	    return readString;
-    }
-
-    public class MyLocationListener implements LocationListener {
-
-	    @Override
-	    public void onLocationChanged(Location loc) {
-            putSharedData("PANDROID_DATA", "latitude", new Double(loc.getLatitude()).toString(), "float");
-            putSharedData("PANDROID_DATA", "longitude", new Double(loc.getLongitude()).toString(), "float");
-	    }
-	    
-	    @Override	
-	    public void onProviderDisabled(String provider) {
-            putSharedData("PANDROID_DATA", "latitude", "181", "float");
-            putSharedData("PANDROID_DATA", "longitude", "181", "float");
-	    }
-	
-	    @Override
-	    public void onProviderEnabled(String provider) {
-	    }
-	
-	    @Override
-	
-	    public void onStatusChanged(String provider, int status, Bundle extras) {
-	    }
-
-    }/* End of Class MyLocationListener */
 }
\ No newline at end of file
diff --git a/pandora_agents/android/src/pandroid/agent/PandroidAgentListener.java b/pandora_agents/android/src/pandroid/agent/PandroidAgentListener.java
new file mode 100644
index 0000000000..06d5d34a10
--- /dev/null
+++ b/pandora_agents/android/src/pandroid/agent/PandroidAgentListener.java
@@ -0,0 +1,323 @@
+package pandroid.agent;
+
+import java.util.Date;
+import java.util.List;
+
+import android.app.Activity;
+import android.app.Service;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+
+import android.os.Handler;
+
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.FileOutputStream;
+import java.util.Calendar;
+
+public class PandroidAgentListener extends Service {
+    Handler h = new Handler();
+
+    int defaultInterval = 300;
+    String defaultServerPort = "41121";
+    String defaultServerAddr = "10.0.2.2";
+    String defaultAgentName = "pandroidAgent";
+    String defaultGpsStatus = "disabled"; // "disabled" or "enabled"
+    String lastGpsContactDateTime = "";
+
+    boolean showLastXML = true;
+    
+	@Override
+	public void onCreate() {
+	}
+	
+	@Override
+	public int onStartCommand(Intent intent, int flags, int startId) {
+		updateValues();
+		contact();
+		stopSelf(startId);
+	    return START_NOT_STICKY;
+	}
+
+	@Override
+	public IBinder onBind(Intent intent) {
+		return null;
+	}
+	
+	private void contact(){
+        Date date = new Date();
+        
+    	putSharedData("PANDROID_DATA", "contactError", "0", "integer");
+        putSharedData("PANDROID_DATA", "lastContact", Long.toString(date.getTime() / 1000), "long");
+        
+        // Keep lastXML sended if is not empty (empty means error sending it)
+        String lastXML = buildXML();
+        
+		String agentName = getSharedData("PANDROID_DATA", "agentName", defaultAgentName, "string");
+
+		String destFileName = agentName + "." + System.currentTimeMillis() + ".data";
+		
+		writeFile(destFileName, lastXML);
+
+		String[] tentacleData = {
+				  "-a",
+				  getSharedData("PANDROID_DATA", "serverAddr", "", "string"),
+				  "-p",
+				  defaultServerPort,
+				  "-v",
+				  "/data/data/pandroid.agent/files/" + destFileName
+	    		  };
+
+		int tentacleRet = new tentacle_client().tentacle_client(tentacleData);
+		//int tentacleRet = 0;
+		
+        if(tentacleRet == 0) {
+            putSharedData("PANDROID_DATA", "lastXML", lastXML, "string");
+        }
+        else {
+        	putSharedData("PANDROID_DATA", "contactError", "1", "integer");
+        }
+	}
+	
+	private String buildXML(){
+		String buffer = "";
+		String gpsData = "";
+		buffer += "<?xml version='1.0' encoding='utf-8'?>\n";
+		
+		String latitude = getSharedData("PANDROID_DATA", "latitude", "181", "float");
+		String longitude = getSharedData("PANDROID_DATA", "longitude", "181", "float");
+
+		if(!latitude.equals("181.0") && !longitude.equals("181.0")) {
+			gpsData = " latitude='" + latitude + "' longitude='" + longitude + "'";
+		}
+		
+		String agentName = getSharedData("PANDROID_DATA", "agentName", defaultAgentName, "string");
+		String interval = getSharedData("PANDROID_DATA", "interval", Integer.toString(defaultInterval), "integer");
+		
+		buffer += "<agent_data description='' group='' os_name='android' os_version='2.1' interval='"+ interval +"' version='3.2RC1(Build 101103)' timestamp='" + getHumanDateTime(-1) + "' agent_name='" + agentName + "' timezone_offset='0'" + gpsData +">\n";
+		
+		// Modules
+		buffer += buildmoduleXML("battery_level", "The actually device battery level", "generic_data", getSharedData("PANDROID_DATA", "batteryLevel", "-1", "integer"));		
+		//buffer += buildmoduleXML("last_gps_contact", "Datetime of the last geo-location contact", "generic_data", lastGpsContactDateTime);
+		
+		// End_Modules
+		
+		buffer += "</agent_data>";
+		
+		return buffer;
+	}
+	
+    private void writeFile(String fileName, String textToWrite) {
+    	try { // catches IOException below
+    	                        FileOutputStream fOut = openFileOutput(fileName,
+    	                                                                MODE_WORLD_READABLE);
+    	                        OutputStreamWriter osw = new OutputStreamWriter(fOut); 
+    	 
+    	                        // Write the string to the file
+    	                        osw.write(textToWrite);
+    	                        /* ensure that everything is
+    	                         * really written out and close */
+    	                        osw.flush();
+    	                        osw.close();
+    	} catch (IOException e) {
+
+    	}
+
+    }
+    
+	private String buildmoduleXML(String name, String description, String type, String data){
+		String buffer = "";
+		buffer += "  <module>\n";
+		buffer += "    <name><![CDATA[" + name + "]]></name>\n";
+		buffer += "    <description><![CDATA[" + description + "]]></description>\n";
+		buffer += "    <type><![CDATA[" + type + "]]></type>\n";
+		buffer += "    <data><![CDATA[" + data + "]]></data>\n";
+		buffer += "  </module>\n";
+		
+		return buffer;
+	}
+	
+    private void gpsLocation() {
+    	// Starts with GPS, if no GPS then gets network location
+    	
+		LocationManager lm = (LocationManager) getSystemService(Context.LOCATION_SERVICE);  
+		List<String> providers = lm.getProviders(true);
+
+		/* Loop over the array backwards, and if you get an accurate location, then break out the loop*/
+		Location loc = null;
+
+		for (int i=providers.size()-1; i>=0; i--) {
+		    loc = lm.getLastKnownLocation(providers.get(i));
+		    if (loc != null) break;
+		}
+
+		if (loc != null) {
+			//if(latitude != loc.getLatitude() || longitude != loc.getLongitude()) {
+				lastGpsContactDateTime = getHumanDateTime(-1);
+			//}
+            putSharedData("PANDROID_DATA", "latitude", new Double(loc.getLatitude()).toString(), "float");
+            putSharedData("PANDROID_DATA", "longitude", new Double(loc.getLongitude()).toString(), "float");
+		}
+		else {             
+            putSharedData("PANDROID_DATA", "latitude", "181", "float");
+            putSharedData("PANDROID_DATA", "longitude", "181", "float");
+		}
+		
+    }
+    
+    private void batteryLevel() {
+        BroadcastReceiver batteryLevelReceiver = new BroadcastReceiver() {
+            public void onReceive(Context context, Intent intent) {
+                context.unregisterReceiver(this);
+                int rawlevel = intent.getIntExtra("level", -1);
+                int scale = intent.getIntExtra("scale", -1);
+                if (rawlevel >= 0 && scale > 0) {
+                    putSharedData("PANDROID_DATA", "batteryLevel", new Integer((rawlevel * 100) / scale).toString(), "integer");
+                }
+            }
+        };
+        IntentFilter batteryLevelFilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
+        registerReceiver(batteryLevelReceiver, batteryLevelFilter);
+    }
+
+	private void updateValues() {
+        batteryLevel();
+        String gpsStatus = getSharedData("PANDROID_DATA", "gpsStatus", defaultGpsStatus, "string");
+        
+        if(gpsStatus.equals("enabled")) {
+			gpsLocation();
+        }
+        else {
+            putSharedData("PANDROID_DATA", "latitude", "181.0", "float");
+            putSharedData("PANDROID_DATA", "longitude", "181.0", "float");
+        }
+	}
+	
+    private void putSharedData(String preferenceName, String tokenName, String data, String type) {
+		int mode = Activity.MODE_PRIVATE;
+		SharedPreferences agentPreferences = getSharedPreferences(preferenceName, mode);
+		SharedPreferences.Editor editor = agentPreferences.edit();
+		
+		if(type == "boolean") {
+			editor.putBoolean(tokenName, Boolean.parseBoolean(data));
+		}
+		else if(type == "float") {
+			editor.putFloat(tokenName, Float.parseFloat(data));
+		}
+		else if(type == "integer") {
+			editor.putInt(tokenName, Integer.parseInt(data));
+		}
+		else if(type == "long") {
+			editor.putLong(tokenName, Long.parseLong(data));
+		}
+		else if(type == "string") {
+			editor.putString(tokenName, data);
+		}
+		
+		editor.commit();
+    }
+    
+    private String getSharedData(String preferenceName, String tokenName, String defaultValue, String type) {
+		int mode = Activity.MODE_PRIVATE;
+		SharedPreferences agentPreferences = getSharedPreferences(preferenceName, mode);
+		
+		if(type == "boolean") {
+			boolean a = agentPreferences.getBoolean(tokenName, Boolean.parseBoolean(defaultValue));
+			return new Boolean(a).toString();
+		}
+		else if(type == "float") {
+			float a = agentPreferences.getFloat(tokenName, Float.parseFloat(defaultValue));
+			return new Float(a).toString();
+		}
+		else if(type == "integer") {
+			int a = agentPreferences.getInt(tokenName, Integer.parseInt(defaultValue));
+			return new Integer(a).toString();
+		}
+		else if(type == "long") {
+			long a = agentPreferences.getLong(tokenName, Long.parseLong(defaultValue));
+			return new Long(a).toString();
+		}
+		else if(type == "string") {
+			return agentPreferences.getString(tokenName, defaultValue);
+		}
+		
+		return "";
+    }
+	
+    private String getHumanDateTime(long unixtime){
+        Calendar dateTime = Calendar.getInstance();
+        if(unixtime != -1) {
+        	dateTime.setTimeInMillis(unixtime);
+        }
+        String humanDateTime;
+        
+        humanDateTime = dateTime.get(Calendar.YEAR) + "/";
+        
+        int month = dateTime.get(Calendar.MONTH) + 1;
+        if(month < 10) {
+        	humanDateTime += "0";
+        }
+    	humanDateTime += month + "/";
+
+    	int day = dateTime.get(Calendar.DAY_OF_MONTH);
+        if(day < 10) {
+        	humanDateTime += "0";
+        }
+    	humanDateTime += day + " ";
+    	
+    	int hour = dateTime.get(Calendar.HOUR_OF_DAY);
+        if(hour < 10) {
+        	humanDateTime += "0";
+        }
+    	humanDateTime += hour + ":";
+    	
+    	int minute = dateTime.get(Calendar.MINUTE);
+        if(minute < 10) {
+        	humanDateTime += "0";
+        }
+    	humanDateTime += minute + ":";
+        
+    	int second = dateTime.get(Calendar.SECOND);
+        if(second < 10) {
+        	humanDateTime += "0";
+        }
+    	humanDateTime += second;
+    	
+        return humanDateTime;
+    }
+    
+    ///////////////////////////////////////////
+    // Getting values from device functions
+    ///////////////////////////////////////////
+    
+    public class MyLocationListener implements LocationListener {
+
+	    @Override
+	    public void onLocationChanged(Location loc) {
+            putSharedData("PANDROID_DATA", "latitude", new Double(loc.getLatitude()).toString(), "float");
+            putSharedData("PANDROID_DATA", "longitude", new Double(loc.getLongitude()).toString(), "float");
+	    }
+	    
+	    @Override	
+	    public void onProviderDisabled(String provider) {
+	    }
+	
+	    @Override
+	    public void onProviderEnabled(String provider) {
+	    }
+	
+	    @Override
+	
+	    public void onStatusChanged(String provider, int status, Bundle extras) {
+	    }
+
+    }/* End of Class MyLocationListener */
+}
diff --git a/pandora_agents/android/src/pandroid/agent/PandroidAgentTentacle.java b/pandora_agents/android/src/pandroid/agent/PandroidAgentTentacle.java
index 9a287e2063..a11c7d4975 100755
--- a/pandora_agents/android/src/pandroid/agent/PandroidAgentTentacle.java
+++ b/pandora_agents/android/src/pandroid/agent/PandroidAgentTentacle.java
@@ -3,16 +3,12 @@ package pandroid.agent;
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
 import java.net.Socket;
 import java.net.UnknownHostException;
 
-import android.content.Context;
-import android.widget.Toast;
 
 class tentacle_client {