diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 45ca3f1..53a362d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -6,11 +6,11 @@
     
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>   
-
+	<uses-permission android:name="android.permission.VIBRATE" />
     <uses-sdk android:minSdkVersion="10" />
     
     <application
-        android:icon="@drawable/ic_launcher"
+        android:icon="@drawable/bonsai"
         android:label="@string/app_name" >
         <activity
             android:name=".AndroidProjectActivity"
@@ -21,6 +21,13 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        
+                  
+		<receiver android:name=".MyReceiver">
+			<intent-filter>
+			
+			</intent-filter>
+		</receiver>
 
         <activity
             android:name=".SelectBonsaiActivity">
@@ -47,6 +54,10 @@
             android:name=".StartActivity" >
         </activity>
         
+        <service android:name=".AlarmChecker" />
+        
+   
+        
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/bin/AndProject.apk b/bin/AndProject.apk
index bd6fe6f..34d479b 100644
Binary files a/bin/AndProject.apk and b/bin/AndProject.apk differ
diff --git a/bin/classes.dex b/bin/classes.dex
index 0bdd03f..464c760 100644
Binary files a/bin/classes.dex and b/bin/classes.dex differ
diff --git a/bin/classes/bonsai/app/AndroidProjectActivity.class b/bin/classes/bonsai/app/AndroidProjectActivity.class
index a87c8b3..e4b7de3 100644
Binary files a/bin/classes/bonsai/app/AndroidProjectActivity.class and b/bin/classes/bonsai/app/AndroidProjectActivity.class differ
diff --git a/bin/classes/bonsai/app/BonsaiActivity$1.class b/bin/classes/bonsai/app/BonsaiActivity$1.class
index 9c38fe8..ce6e730 100644
Binary files a/bin/classes/bonsai/app/BonsaiActivity$1.class and b/bin/classes/bonsai/app/BonsaiActivity$1.class differ
diff --git a/bin/classes/bonsai/app/BonsaiActivity$2.class b/bin/classes/bonsai/app/BonsaiActivity$2.class
index 3294865..c2580b2 100644
Binary files a/bin/classes/bonsai/app/BonsaiActivity$2.class and b/bin/classes/bonsai/app/BonsaiActivity$2.class differ
diff --git a/bin/classes/bonsai/app/BonsaiActivity.class b/bin/classes/bonsai/app/BonsaiActivity.class
index 6758768..d083903 100644
Binary files a/bin/classes/bonsai/app/BonsaiActivity.class and b/bin/classes/bonsai/app/BonsaiActivity.class differ
diff --git a/bin/classes/bonsai/app/EditBonsaiActivity$1.class b/bin/classes/bonsai/app/EditBonsaiActivity$1.class
index 79a53f2..e552f4f 100644
Binary files a/bin/classes/bonsai/app/EditBonsaiActivity$1.class and b/bin/classes/bonsai/app/EditBonsaiActivity$1.class differ
diff --git a/bin/classes/bonsai/app/EditBonsaiActivity$2.class b/bin/classes/bonsai/app/EditBonsaiActivity$2.class
index 17c39f3..7935c22 100644
Binary files a/bin/classes/bonsai/app/EditBonsaiActivity$2.class and b/bin/classes/bonsai/app/EditBonsaiActivity$2.class differ
diff --git a/bin/classes/bonsai/app/EditBonsaiActivity$3.class b/bin/classes/bonsai/app/EditBonsaiActivity$3.class
index 5320ac7..43c1cd1 100644
Binary files a/bin/classes/bonsai/app/EditBonsaiActivity$3.class and b/bin/classes/bonsai/app/EditBonsaiActivity$3.class differ
diff --git a/bin/classes/bonsai/app/EditBonsaiActivity$4.class b/bin/classes/bonsai/app/EditBonsaiActivity$4.class
index 1a1bda0..b98de0b 100644
Binary files a/bin/classes/bonsai/app/EditBonsaiActivity$4.class and b/bin/classes/bonsai/app/EditBonsaiActivity$4.class differ
diff --git a/bin/classes/bonsai/app/EditBonsaiActivity$5.class b/bin/classes/bonsai/app/EditBonsaiActivity$5.class
index 6743b68..5f6fe05 100644
Binary files a/bin/classes/bonsai/app/EditBonsaiActivity$5.class and b/bin/classes/bonsai/app/EditBonsaiActivity$5.class differ
diff --git a/bin/classes/bonsai/app/EditBonsaiActivity.class b/bin/classes/bonsai/app/EditBonsaiActivity.class
index be7d73d..c1b5ee1 100644
Binary files a/bin/classes/bonsai/app/EditBonsaiActivity.class and b/bin/classes/bonsai/app/EditBonsaiActivity.class differ
diff --git a/bin/classes/bonsai/app/MoreActivity.class b/bin/classes/bonsai/app/MoreActivity.class
index 5ea3cf4..443aeb8 100644
Binary files a/bin/classes/bonsai/app/MoreActivity.class and b/bin/classes/bonsai/app/MoreActivity.class differ
diff --git a/bin/classes/bonsai/app/MyReceiver.class b/bin/classes/bonsai/app/MyReceiver.class
new file mode 100644
index 0000000..70a77ce
Binary files /dev/null and b/bin/classes/bonsai/app/MyReceiver.class differ
diff --git a/bin/classes/bonsai/app/R$drawable.class b/bin/classes/bonsai/app/R$drawable.class
index d5d2049..bf6c678 100644
Binary files a/bin/classes/bonsai/app/R$drawable.class and b/bin/classes/bonsai/app/R$drawable.class differ
diff --git a/bin/classes/bonsai/app/R$id.class b/bin/classes/bonsai/app/R$id.class
index 5f0dfd1..38e68e7 100644
Binary files a/bin/classes/bonsai/app/R$id.class and b/bin/classes/bonsai/app/R$id.class differ
diff --git a/bin/classes/bonsai/app/R$layout.class b/bin/classes/bonsai/app/R$layout.class
index 83028ff..3d515e8 100644
Binary files a/bin/classes/bonsai/app/R$layout.class and b/bin/classes/bonsai/app/R$layout.class differ
diff --git a/bin/classes/bonsai/app/R$menu.class b/bin/classes/bonsai/app/R$menu.class
new file mode 100644
index 0000000..d12a446
Binary files /dev/null and b/bin/classes/bonsai/app/R$menu.class differ
diff --git a/bin/classes/bonsai/app/R$string.class b/bin/classes/bonsai/app/R$string.class
index 0c49a80..fb417b8 100644
Binary files a/bin/classes/bonsai/app/R$string.class and b/bin/classes/bonsai/app/R$string.class differ
diff --git a/bin/classes/bonsai/app/R.class b/bin/classes/bonsai/app/R.class
index 81a4f18..1f8c57f 100644
Binary files a/bin/classes/bonsai/app/R.class and b/bin/classes/bonsai/app/R.class differ
diff --git a/bin/classes/bonsai/app/SelectBonsaiActivity.class b/bin/classes/bonsai/app/SelectBonsaiActivity.class
index f6cf5da..46123dc 100644
Binary files a/bin/classes/bonsai/app/SelectBonsaiActivity.class and b/bin/classes/bonsai/app/SelectBonsaiActivity.class differ
diff --git a/bin/classes/bonsai/app/StartActivity.class b/bin/classes/bonsai/app/StartActivity.class
index dbf7708..761c759 100644
Binary files a/bin/classes/bonsai/app/StartActivity.class and b/bin/classes/bonsai/app/StartActivity.class differ
diff --git a/bin/classes/bonsai/app/TaskActivity$1.class b/bin/classes/bonsai/app/TaskActivity$1.class
new file mode 100644
index 0000000..d2d4886
Binary files /dev/null and b/bin/classes/bonsai/app/TaskActivity$1.class differ
diff --git a/bin/classes/bonsai/app/TaskActivity$2.class b/bin/classes/bonsai/app/TaskActivity$2.class
new file mode 100644
index 0000000..170fb2b
Binary files /dev/null and b/bin/classes/bonsai/app/TaskActivity$2.class differ
diff --git a/bin/classes/bonsai/app/TaskActivity.class b/bin/classes/bonsai/app/TaskActivity.class
index 010e286..6f0eea5 100644
Binary files a/bin/classes/bonsai/app/TaskActivity.class and b/bin/classes/bonsai/app/TaskActivity.class differ
diff --git a/bin/classes/bonsai/app/alarm/AlarmChecker$1.class b/bin/classes/bonsai/app/alarm/AlarmChecker$1.class
new file mode 100644
index 0000000..512b1b1
Binary files /dev/null and b/bin/classes/bonsai/app/alarm/AlarmChecker$1.class differ
diff --git a/bin/classes/bonsai/app/alarm/AlarmChecker.class b/bin/classes/bonsai/app/alarm/AlarmChecker.class
new file mode 100644
index 0000000..c63aa7e
Binary files /dev/null and b/bin/classes/bonsai/app/alarm/AlarmChecker.class differ
diff --git a/bin/classes/bonsai/app/alarm/CheckRiego.class b/bin/classes/bonsai/app/alarm/CheckRiego.class
new file mode 100644
index 0000000..53c83d8
Binary files /dev/null and b/bin/classes/bonsai/app/alarm/CheckRiego.class differ
diff --git a/bin/classes/bonsai/app/weather/Weather.class b/bin/classes/bonsai/app/weather/Weather.class
index fe4b9b5..68064d0 100644
Binary files a/bin/classes/bonsai/app/weather/Weather.class and b/bin/classes/bonsai/app/weather/Weather.class differ
diff --git a/bin/classes/bonsai/app/weather/XmlHandler.class b/bin/classes/bonsai/app/weather/XmlHandler.class
index e97468e..1d4f206 100644
Binary files a/bin/classes/bonsai/app/weather/XmlHandler.class and b/bin/classes/bonsai/app/weather/XmlHandler.class differ
diff --git a/bin/res/drawable-hdpi/ic_launcher.png b/bin/res/drawable-hdpi/ic_launcher.png
index 4c36a79..e5d9e3a 100644
Binary files a/bin/res/drawable-hdpi/ic_launcher.png and b/bin/res/drawable-hdpi/ic_launcher.png differ
diff --git a/bin/res/drawable-ldpi/ic_launcher.png b/bin/res/drawable-ldpi/ic_launcher.png
index c14a719..e5d9e3a 100644
Binary files a/bin/res/drawable-ldpi/ic_launcher.png and b/bin/res/drawable-ldpi/ic_launcher.png differ
diff --git a/bin/res/drawable-mdpi/ic_launcher.png b/bin/res/drawable-mdpi/ic_launcher.png
index f8c557a..e5d9e3a 100644
Binary files a/bin/res/drawable-mdpi/ic_launcher.png and b/bin/res/drawable-mdpi/ic_launcher.png differ
diff --git a/bin/res/drawable-xhdpi/ic_launcher.png b/bin/res/drawable-xhdpi/ic_launcher.png
index 755d28b..e5d9e3a 100644
Binary files a/bin/res/drawable-xhdpi/ic_launcher.png and b/bin/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/bin/res/drawable/bonsai.png b/bin/res/drawable/bonsai.png
new file mode 100644
index 0000000..b0b6cf9
Binary files /dev/null and b/bin/res/drawable/bonsai.png differ
diff --git a/bin/res/drawable/donate.png b/bin/res/drawable/donate.png
new file mode 100644
index 0000000..4d0c113
Binary files /dev/null and b/bin/res/drawable/donate.png differ
diff --git a/bin/res/drawable/ic_launche.png b/bin/res/drawable/ic_launche.png
new file mode 100644
index 0000000..548df2a
Binary files /dev/null and b/bin/res/drawable/ic_launche.png differ
diff --git a/bin/res/drawable/ic_launcher.png b/bin/res/drawable/ic_launcher.png
index f8c557a..e5d9e3a 100644
Binary files a/bin/res/drawable/ic_launcher.png and b/bin/res/drawable/ic_launcher.png differ
diff --git a/bin/res/drawable/ic_menu_help.png b/bin/res/drawable/ic_menu_help.png
new file mode 100644
index 0000000..e2eea4a
Binary files /dev/null and b/bin/res/drawable/ic_menu_help.png differ
diff --git a/bin/res/drawable/ic_task.png b/bin/res/drawable/ic_task.png
new file mode 100644
index 0000000..9e0418d
Binary files /dev/null and b/bin/res/drawable/ic_task.png differ
diff --git a/bin/res/drawable/task.png b/bin/res/drawable/task.png
new file mode 100644
index 0000000..138a571
Binary files /dev/null and b/bin/res/drawable/task.png differ
diff --git a/bin/resources.ap_ b/bin/resources.ap_
index 1973ae5..92504a6 100644
Binary files a/bin/resources.ap_ and b/bin/resources.ap_ differ
diff --git a/gen/bonsai/app/R.java b/gen/bonsai/app/R.java
index c5d62a5..f1c58f7 100644
--- a/gen/bonsai/app/R.java
+++ b/gen/bonsai/app/R.java
@@ -15,92 +15,105 @@ public static final class array {
     public static final class attr {
     }
     public static final class drawable {
-        public static final int chance_of_rain=0x7f020000;
-        public static final int chance_of_snow=0x7f020001;
-        public static final int chance_of_storm=0x7f020002;
-        public static final int cloudy=0x7f020003;
-        public static final int dust=0x7f020004;
-        public static final int escaledlogo=0x7f020005;
-        public static final int fog=0x7f020006;
-        public static final int haze=0x7f020007;
-        public static final int ic_launcher=0x7f020008;
-        public static final int ic_pode=0x7f020009;
-        public static final int ic_tab_bonsai=0x7f02000a;
-        public static final int ic_tab_calendar=0x7f02000b;
-        public static final int ic_tab_more=0x7f02000c;
-        public static final int ic_tab_selectbonsai=0x7f02000d;
-        public static final int ic_transplant=0x7f02000e;
-        public static final int ic_water=0x7f02000f;
-        public static final int icy=0x7f020010;
-        public static final int mist=0x7f020011;
-        public static final int mostly_sunny=0x7f020012;
-        public static final int sleet=0x7f020013;
-        public static final int smoke=0x7f020014;
-        public static final int snow=0x7f020015;
-        public static final int storm=0x7f020016;
-        public static final int sunny=0x7f020017;
-        public static final int thunderstorm=0x7f020018;
+        public static final int bonsai=0x7f020000;
+        public static final int chance_of_rain=0x7f020001;
+        public static final int chance_of_snow=0x7f020002;
+        public static final int chance_of_storm=0x7f020003;
+        public static final int cloudy=0x7f020004;
+        public static final int donate=0x7f020005;
+        public static final int dust=0x7f020006;
+        public static final int escaledlogo=0x7f020007;
+        public static final int fog=0x7f020008;
+        public static final int haze=0x7f020009;
+        public static final int ic_launche=0x7f02000a;
+        public static final int ic_launcher=0x7f02000b;
+        public static final int ic_menu_help=0x7f02000c;
+        public static final int ic_pode=0x7f02000d;
+        public static final int ic_tab_bonsai=0x7f02000e;
+        public static final int ic_tab_calendar=0x7f02000f;
+        public static final int ic_tab_more=0x7f020010;
+        public static final int ic_tab_selectbonsai=0x7f020011;
+        public static final int ic_task=0x7f020012;
+        public static final int ic_transplant=0x7f020013;
+        public static final int ic_water=0x7f020014;
+        public static final int icy=0x7f020015;
+        public static final int mist=0x7f020016;
+        public static final int mostly_sunny=0x7f020017;
+        public static final int sleet=0x7f020018;
+        public static final int smoke=0x7f020019;
+        public static final int snow=0x7f02001a;
+        public static final int storm=0x7f02001b;
+        public static final int sunny=0x7f02001c;
+        public static final int task=0x7f02001d;
+        public static final int thunderstorm=0x7f02001e;
     }
     public static final class id {
-        public static final int ImageView01=0x7f06000d;
-        public static final int bonsaiImage=0x7f060002;
-        public static final int bonsairowtext=0x7f06001b;
-        public static final int btnCountry=0x7f060027;
-        public static final int btnPostCode=0x7f060025;
-        public static final int button1=0x7f060021;
-        public static final int button2=0x7f060022;
-        public static final int cancelButton=0x7f06002e;
-        public static final int donatebutton=0x7f06002c;
-        public static final int editAge=0x7f06001e;
-        public static final int editCountry=0x7f060026;
-        public static final int editHeight=0x7f06001f;
-        public static final int editName=0x7f06001c;
-        public static final int editPostCode=0x7f060024;
-        public static final int familySpinner=0x7f06001d;
-        public static final int footer=0x7f060016;
-        public static final int imageButton1=0x7f060019;
-        public static final int imageButton2=0x7f06001a;
-        public static final int imageButton3=0x7f060029;
-        public static final int imageView1=0x7f06002f;
-        public static final int imageView2=0x7f06000a;
-        public static final int imageView4=0x7f060010;
-        public static final int imageView5=0x7f060013;
-        public static final int imageWeather=0x7f060008;
-        public static final int linearLayout1=0x7f060001;
-        public static final int photoURLtext=0x7f060020;
-        public static final int podeButton=0x7f060018;
-        public static final int relativeLayout1=0x7f060028;
-        public static final int saveButton=0x7f06002d;
-        public static final int scrollMore=0x7f060015;
-        public static final int scrollView1=0x7f060000;
-        public static final int spinner1=0x7f060023;
-        public static final int tableRow1=0x7f060009;
-        public static final int tableRow2=0x7f06000c;
-        public static final int tableRow3=0x7f06000f;
-        public static final int tableRow4=0x7f060012;
-        public static final int textFamily=0x7f060004;
-        public static final int textName=0x7f060003;
-        public static final int textPrune=0x7f06000e;
-        public static final int textTemperature=0x7f060014;
-        public static final int textTransplant=0x7f060011;
-        public static final int textView1=0x7f06002a;
-        public static final int textView2=0x7f06002b;
-        public static final int textView3=0x7f060006;
-        public static final int textWater=0x7f06000b;
-        public static final int textYears=0x7f060005;
-        public static final int textweather=0x7f060007;
-        public static final int waterButton=0x7f060017;
+        public static final int ImageView01=0x7f07000d;
+        public static final int MnuOpc1=0x7f070031;
+        public static final int bonsaiImage=0x7f070002;
+        public static final int bonsairowtext=0x7f07001b;
+        public static final int btnAlarm=0x7f070030;
+        public static final int btnCountry=0x7f07002a;
+        public static final int btnPostCode=0x7f070028;
+        public static final int button1=0x7f070024;
+        public static final int button2=0x7f070025;
+        public static final int cancelButton=0x7f07001e;
+        public static final int donatebutton=0x7f07002e;
+        public static final int editAge=0x7f070021;
+        public static final int editCountry=0x7f070029;
+        public static final int editHeight=0x7f070022;
+        public static final int editName=0x7f07001f;
+        public static final int editPostCode=0x7f070027;
+        public static final int familySpinner=0x7f070020;
+        public static final int footer=0x7f070016;
+        public static final int imageButton1=0x7f070019;
+        public static final int imageButton2=0x7f07001a;
+        public static final int imageButton3=0x7f07002c;
+        public static final int imageView1=0x7f07002f;
+        public static final int imageView2=0x7f07000a;
+        public static final int imageView4=0x7f070010;
+        public static final int imageView5=0x7f070013;
+        public static final int imageWeather=0x7f070008;
+        public static final int linearLayout1=0x7f070001;
+        public static final int photoURLtext=0x7f070023;
+        public static final int podeButton=0x7f070018;
+        public static final int relativeLayout1=0x7f07002b;
+        public static final int saveButton=0x7f07001d;
+        public static final int scrollMore=0x7f070015;
+        public static final int scrollView1=0x7f070000;
+        public static final int spinner1=0x7f070026;
+        public static final int tableRow1=0x7f070009;
+        public static final int tableRow2=0x7f07000c;
+        public static final int tableRow3=0x7f07000f;
+        public static final int tableRow4=0x7f070012;
+        public static final int textFamily=0x7f070004;
+        public static final int textName=0x7f070003;
+        public static final int textPrune=0x7f07000e;
+        public static final int textTemperature=0x7f070014;
+        public static final int textTransplant=0x7f070011;
+        public static final int textView1=0x7f07001c;
+        public static final int textView2=0x7f07002d;
+        public static final int textView3=0x7f070006;
+        public static final int textWater=0x7f07000b;
+        public static final int textYears=0x7f070005;
+        public static final int textweather=0x7f070007;
+        public static final int waterButton=0x7f070017;
     }
     public static final class layout {
         public static final int bonsai=0x7f030000;
         public static final int bonsai_row=0x7f030001;
-        public static final int editbonsai=0x7f030002;
-        public static final int main=0x7f030003;
-        public static final int more=0x7f030004;
-        public static final int selectbonsai=0x7f030005;
-        public static final int start=0x7f030006;
-        public static final int task=0x7f030007;
-        public static final int task_row=0x7f030008;
+        public static final int calendar=0x7f030002;
+        public static final int editbonsai=0x7f030003;
+        public static final int gallery=0x7f030004;
+        public static final int main=0x7f030005;
+        public static final int more=0x7f030006;
+        public static final int selectbonsai=0x7f030007;
+        public static final int start=0x7f030008;
+        public static final int task=0x7f030009;
+        public static final int task_row=0x7f03000a;
+    }
+    public static final class menu {
+        public static final int menu=0x7f060000;
     }
     public static final class string {
         public static final int app_name=0x7f040000;
@@ -112,6 +125,7 @@ public static final class string {
         public static final int edit_button=0x7f04001a;
         public static final int image_desc_bonsai=0x7f04000b;
         public static final int loading_text=0x7f040011;
+        public static final int menu_help=0x7f04001e;
         public static final int pode_button=0x7f040018;
         public static final int pode_no_info=0x7f040014;
         public static final int save_button=0x7f04001b;
diff --git a/res/drawable-hdpi/ic_launcher.png b/res/drawable-hdpi/ic_launcher.png
index 41f8b38..e5d9e3a 100644
Binary files a/res/drawable-hdpi/ic_launcher.png and b/res/drawable-hdpi/ic_launcher.png differ
diff --git a/res/drawable-ldpi/ic_launcher.png b/res/drawable-ldpi/ic_launcher.png
index 0abe2bb..e5d9e3a 100644
Binary files a/res/drawable-ldpi/ic_launcher.png and b/res/drawable-ldpi/ic_launcher.png differ
diff --git a/res/drawable-mdpi/ic_launcher.png b/res/drawable-mdpi/ic_launcher.png
index 8ff4adb..e5d9e3a 100644
Binary files a/res/drawable-mdpi/ic_launcher.png and b/res/drawable-mdpi/ic_launcher.png differ
diff --git a/res/drawable-xhdpi/ic_launcher.png b/res/drawable-xhdpi/ic_launcher.png
index 3c4306a..e5d9e3a 100644
Binary files a/res/drawable-xhdpi/ic_launcher.png and b/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/res/drawable/bonsai.png b/res/drawable/bonsai.png
new file mode 100644
index 0000000..a3af486
Binary files /dev/null and b/res/drawable/bonsai.png differ
diff --git a/res/drawable/donate.png b/res/drawable/donate.png
new file mode 100644
index 0000000..c96fe06
Binary files /dev/null and b/res/drawable/donate.png differ
diff --git a/res/drawable/ic_launche.png b/res/drawable/ic_launche.png
new file mode 100644
index 0000000..b4be628
Binary files /dev/null and b/res/drawable/ic_launche.png differ
diff --git a/res/drawable/ic_launcher.png b/res/drawable/ic_launcher.png
index 8ff4adb..e5d9e3a 100644
Binary files a/res/drawable/ic_launcher.png and b/res/drawable/ic_launcher.png differ
diff --git a/res/drawable/ic_menu_help.png b/res/drawable/ic_menu_help.png
new file mode 100644
index 0000000..7c55dfd
Binary files /dev/null and b/res/drawable/ic_menu_help.png differ
diff --git a/res/drawable/ic_tab_bonsai.xml b/res/drawable/ic_tab_bonsai.xml
index a3968f1..1a9a1b3 100644
--- a/res/drawable/ic_tab_bonsai.xml
+++ b/res/drawable/ic_tab_bonsai.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- When selected, use grey -->
-    <item android:drawable="@drawable/ic_launcher"
+    <item android:drawable="@drawable/bonsai"
           android:state_selected="true" />
     <!-- When not selected, use white-->
-    <item android:drawable="@drawable/ic_launcher" />
+    <item android:drawable="@drawable/bonsai" />
 </selector>
\ No newline at end of file
diff --git a/res/drawable/ic_tab_calendar.xml b/res/drawable/ic_tab_calendar.xml
index a3968f1..1ed1607 100644
--- a/res/drawable/ic_tab_calendar.xml
+++ b/res/drawable/ic_tab_calendar.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- When selected, use grey -->
-    <item android:drawable="@drawable/ic_launcher"
+    <item android:drawable="@drawable/ic_task"
           android:state_selected="true" />
     <!-- When not selected, use white-->
-    <item android:drawable="@drawable/ic_launcher" />
+    <item android:drawable="@drawable/ic_task" />
 </selector>
\ No newline at end of file
diff --git a/res/drawable/ic_tab_more.xml b/res/drawable/ic_tab_more.xml
index a3968f1..07b4646 100644
--- a/res/drawable/ic_tab_more.xml
+++ b/res/drawable/ic_tab_more.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- When selected, use grey -->
-    <item android:drawable="@drawable/ic_launcher"
+    <item android:drawable="@drawable/donate"
           android:state_selected="true" />
     <!-- When not selected, use white-->
-    <item android:drawable="@drawable/ic_launcher" />
+    <item android:drawable="@drawable/donate" />
 </selector>
\ No newline at end of file
diff --git a/res/drawable/ic_tab_selectbonsai.xml b/res/drawable/ic_tab_selectbonsai.xml
index a3968f1..d44c243 100644
--- a/res/drawable/ic_tab_selectbonsai.xml
+++ b/res/drawable/ic_tab_selectbonsai.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- When selected, use grey -->
-    <item android:drawable="@drawable/ic_launcher"
+    <item android:drawable="@drawable/ic_launche"
           android:state_selected="true" />
     <!-- When not selected, use white-->
-    <item android:drawable="@drawable/ic_launcher" />
+    <item android:drawable="@drawable/ic_launche" />
 </selector>
\ No newline at end of file
diff --git a/res/drawable/ic_task.png b/res/drawable/ic_task.png
new file mode 100644
index 0000000..31b29e7
Binary files /dev/null and b/res/drawable/ic_task.png differ
diff --git a/res/drawable/task.png b/res/drawable/task.png
new file mode 100644
index 0000000..7aa5ede
Binary files /dev/null and b/res/drawable/task.png differ
diff --git a/res/layout/editbonsai.xml b/res/layout/editbonsai.xml
index ad37e5d..f1876ed 100644
--- a/res/layout/editbonsai.xml
+++ b/res/layout/editbonsai.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="vertical" >
+
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -244,4 +250,5 @@
         </LinearLayout>
     </RelativeLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
+  </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/task.xml b/res/layout/task.xml
index 6bcf653..69de873 100644
--- a/res/layout/task.xml
+++ b/res/layout/task.xml
@@ -30,5 +30,15 @@
     		android:textAppearance="?android:attr/textAppearanceSmall"/>
         
     </LinearLayout>
+    
+        <Button
+        android:id="@+id/btnAlarm"
+        style="?android:attr/buttonStyleSmall"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:text="Alarm OFF" />
+    
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/menu/menu.xml b/res/menu/menu.xml
new file mode 100644
index 0000000..6773fc7
--- /dev/null
+++ b/res/menu/menu.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+  xmlns:android="http://schemas.android.com/apk/res/android">
+ 
+<item android:id="@+id/MnuOpc1" android:title="@string/menu_help"
+      android:icon="@drawable/ic_menu_help"></item>
+</menu>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 75f2e17..f0d3d25 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -42,6 +42,7 @@
     <string name="save_button">"Save"</string>
     <string name="delete_button">"Delete"</string>
     <string name="cancel_button">"Cancel"</string>
+    <string name="menu_help">"What it is?"</string>
     
     
     
diff --git a/src/bonsai/app/AndroidProjectActivity.java b/src/bonsai/app/AndroidProjectActivity.java
index b2a32dd..5cfac2c 100644
--- a/src/bonsai/app/AndroidProjectActivity.java
+++ b/src/bonsai/app/AndroidProjectActivity.java
@@ -47,7 +47,7 @@ public void onCreate(Bundle savedInstanceState) {
 
 	    // Create an Intent to launch an Activity for the tab (to be reused)
 	    intent = new Intent().setClass(this, SelectBonsaiActivity.class);
-	    spec = tabHost.newTabSpec("all").setIndicator("All",
+	    spec = tabHost.newTabSpec("all").setIndicator("",
 	                      res.getDrawable(R.drawable.ic_tab_selectbonsai))
 	                  .setContent(intent);
 	    tabHost.addTab(spec);
@@ -55,20 +55,20 @@ public void onCreate(Bundle savedInstanceState) {
 	    // Initialize a TabSpec for each tab and add it to the TabHost
 	    
 	    intent = new Intent().setClass(this, BonsaiActivity.class);
-	    spec = tabHost.newTabSpec("bonsai").setIndicator("Bonsai",
+	    spec = tabHost.newTabSpec("bonsai").setIndicator("",
 	                      res.getDrawable(R.drawable.ic_tab_bonsai))
 	                  .setContent(intent);
 	    tabHost.addTab(spec);
 
 	    // Do the same for the other tabs
 	    intent = new Intent().setClass(this, TaskActivity.class);
-	    spec = tabHost.newTabSpec("calendar").setIndicator("Today Tasks",
+	    spec = tabHost.newTabSpec("calendar").setIndicator("",
 	                      res.getDrawable(R.drawable.ic_tab_calendar))
 	                  .setContent(intent);
 	    tabHost.addTab(spec);
 	    
 	    intent = new Intent().setClass(this, MoreActivity.class);
-	    spec = tabHost.newTabSpec("more").setIndicator("More",
+	    spec = tabHost.newTabSpec("more").setIndicator("",
 	                      res.getDrawable(R.drawable.ic_tab_more))
 	                  .setContent(intent);
 	    tabHost.addTab(spec);
diff --git a/src/bonsai/app/BonsaiActivity.java b/src/bonsai/app/BonsaiActivity.java
index c60b45d..2c76c73 100644
--- a/src/bonsai/app/BonsaiActivity.java
+++ b/src/bonsai/app/BonsaiActivity.java
@@ -9,6 +9,9 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.ImageView.ScaleType;
@@ -93,11 +96,12 @@ public void onResume() {
              } else photo.setImageResource(R.drawable.ic_launcher);
              long date = new Date().getTime() / (1000*60*60);
              age.setText("" + ((date - bonsai.getLong(bonsai.getColumnIndexOrThrow(BonsaiDbUtil.KEY_AGE)))/(365*24)));
+             checkWeather();
+             weatherAction();
              checkWater();
              checkTransplant();
              checkPode();
-             checkWeather();
-             weatherAction();
+      
             
              
              
@@ -185,7 +189,7 @@ private void checkWater() {
         	
         	if(lastwatered == 0) textWater.setText("Never watered (or no info)");
         	else if(temperature > 35) textWater.setText("You should water 2 times with " + height/4 + " cl today.");
-        	else if(temperature < 0) textWater.setText("It's really cold, you should not water today.");
+        	else if(w.getTempMin() < 0) textWater.setText("It's really cold, you should not water today.");
         	else if((hoursTime - lastwatered) > waterfrec) textWater.setText("You should water today once with " + height/2 +" cl.");
         	else textWater.setText("Water OK. Last watered: " + new Date((long)(lastwatered * (1000*60*60))).toLocaleString().toString().substring(0,16));
         	
@@ -259,7 +263,7 @@ private void checkPode() {
         	
         	// LOGICA DE TRANSPLANTE
         	if(lastpode == 0) textPrune.setText("No info about " + name + " prunes.\nMaybe never pruned.");
-        	else if(age < 2) {	// Los bonsais con menos de dos a–os se suelen defoliar al 50% cada 2 meses, aprox
+        	else if(age < 2) {	// Los bonsais con menos de dos a�os se suelen defoliar al 50% cada 2 meses, aprox
         		if(hoursTime - lastpode > 60 * 24) textPrune.setText("Defoliate your bonsai 50%");
         		else textPrune.setText("Your bonsai prune is not necessary");
         	}
@@ -302,7 +306,7 @@ public void run() {
     
     public void setTempInfo() {
     	try{
-	   		textWeather.setText(Double.toString(w.getTempMedia())+"¼C");
+	   		textWeather.setText(Integer.toString(w.getTempMedia())+"ºC");
     	} catch (Exception e) {
     	
     	}
@@ -375,30 +379,27 @@ public void setWeatherComment() {
 	        s=s.replaceAll(".gif", "");
 	        System.out.println("El nombre del icono que me queda es " + s);
 
+
 	         if(s.equals("icy")){
 	         	if(situation.equals("Exterior"))
 	         	textTemperature.setText("Your Bonsai is frozen, please put it indoor");
-	         		}
-	         if(situation.equals("Interior"))
-	         	textTemperature.setText("Your Bonsai would like to have some sunbathing today");
-	         
-	         if(s.equals("smoke"))
-	         if(s.equals("snow")){
+	         		}	         
+	         if(s.equals("snow")||s.equals("chance_of_snow")){
 	         	if(situation.equals("Exterior"))
 	             	textTemperature.setText("Your Bonsai looks like snowman");
 	         		}
-	         if(s.equals("storm")){
+	         if(s.equals("thunderstorm")){
 	         	if(situation.equals("Exterior"))
 	             	textTemperature.setText("Your Bonsai is scare of thunderstorm");
 	         		}
-	         if(s.equals("sunny")){
+	         if(s.equals("sunny")||s.equals("mostly_sunny")){
 	         	if(situation.equals("Interior"))
 	             	textTemperature.setText("Your Bonsai would like to " +
 	             			"have some sunbathing today");
 	         	}
-	         if(s.equals("thunderstorm")){
-	         	if(situation.equals("Exterior"))
-	             	textTemperature.setText("Your Bonsai is scare of thunderstorm");
+	         else{
+	        	 textTemperature.setText("The weather is ok for you bonsai");
+	        	 
 	         }
        	} catch (Exception e) {
         	
@@ -449,4 +450,23 @@ public void makeTransplant(View v) {
     	onResume();
     }
     
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.menu, menu);
+        return true;
+    }
+    
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.MnuOpc1:
+            	Toast.makeText(this,"Display current information about the status of your bonsai", Toast.LENGTH_LONG).show();
+                return true;
+
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+    
 }
\ No newline at end of file
diff --git a/src/bonsai/app/EditBonsaiActivity.java b/src/bonsai/app/EditBonsaiActivity.java
index b7f02e4..a7a4aed 100644
--- a/src/bonsai/app/EditBonsaiActivity.java
+++ b/src/bonsai/app/EditBonsaiActivity.java
@@ -20,6 +20,9 @@
 import android.os.Bundle;
 import android.util.Log;
 import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.EditText;
@@ -321,5 +324,24 @@ public void goMakePostCode(View v){
  		}
      	
      }
+    
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.menu, menu);
+        return true;
+    }
+    
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.MnuOpc1:
+            	Toast.makeText(this,"Change and update information about your bonsai.For the location, you simply click 'get it'", Toast.LENGTH_LONG).show();
+                return true;
+
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
 
 }
\ No newline at end of file
diff --git a/src/bonsai/app/MyReceiver.java b/src/bonsai/app/MyReceiver.java
new file mode 100644
index 0000000..a459789
--- /dev/null
+++ b/src/bonsai/app/MyReceiver.java
@@ -0,0 +1,57 @@
+package bonsai.app;
+
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.widget.Toast;
+
+public class MyReceiver extends android.content.BroadcastReceiver {
+	
+	public static final int APP_ID_NOTIFICATION = 0;
+	private static final int NOTIF_ALERTA_ID = 1;
+	
+	
+	@Override
+    public void onReceive(android.content.Context context, android.content.Intent intent) {
+         Toast.makeText(context, "Y Por fin!!! Salta la notificación!!", Toast.LENGTH_LONG).show();
+     Notificar(context);    
+	}
+	
+	public void Notificar(android.content.Context context){
+       //Obtenemos una referencia al servicio de notificaciones
+         NotificationManager notManager = 
+        		 (NotificationManager)context.getSystemService(Context.NOTIFICATION_SERVICE) ; 
+         
+       //Configuramos la notificación
+         int icono = 0x7f020000;
+         CharSequence textoEstado = "Mensaje de Bonsai Cares";
+         long hora = System.currentTimeMillis();
+          
+         Notification notif =
+             new Notification(icono, textoEstado, hora);
+         
+       //Configuramos el Intent
+         Context contexto =context;
+         CharSequence titulo = "Mensaje de Bonsai Cares";
+         CharSequence descripcion = "Notificación de Riego";
+          
+         Intent notIntent = new Intent(contexto,
+             TaskActivity.class);
+         
+         PendingIntent contIntent = PendingIntent.getActivity(
+        		    contexto, 0, notIntent, 0);
+        		 
+        		notif.setLatestEventInfo(
+        		    contexto, titulo, descripcion, contIntent);
+         
+       //AutoCancel: cuando se pulsa la notificaión ésta desaparece
+         notif.flags |= Notification.FLAG_AUTO_CANCEL;
+         //mando la notificación
+         notManager.notify(NOTIF_ALERTA_ID, notif);
+
+    }
+	
+}
\ No newline at end of file
diff --git a/src/bonsai/app/SelectBonsaiActivity.java b/src/bonsai/app/SelectBonsaiActivity.java
index 32db039..bbd6194 100644
--- a/src/bonsai/app/SelectBonsaiActivity.java
+++ b/src/bonsai/app/SelectBonsaiActivity.java
@@ -5,6 +5,9 @@
 import android.content.Intent;
 import android.database.Cursor;
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.ListView;
 import android.widget.SimpleCursorAdapter;
@@ -83,6 +86,25 @@ public void goCreate(View v) {
     	}
     }
     
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.menu, menu);
+        return true;
+    }
+    
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.MnuOpc1:
+            	Toast.makeText(this,"Select your bonsai to check for current information. Press '+' to add a new Bosai", Toast.LENGTH_LONG).show();
+                return true;
+
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+    
     
     
     
diff --git a/src/bonsai/app/TaskActivity.java b/src/bonsai/app/TaskActivity.java
index addf20c..fb55e10 100644
--- a/src/bonsai/app/TaskActivity.java
+++ b/src/bonsai/app/TaskActivity.java
@@ -1,11 +1,25 @@
 package bonsai.app;
 
-import java.util.Date;
 
+import java.util.Date;
+import java.util.List;
+import bonsai.app.weather.Weather;
+import bonsai.app.weather.XmlParserSax;
+import android.app.AlarmManager;
 import android.app.ListActivity;
+import android.app.PendingIntent;
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.content.Intent;
 import android.database.Cursor;
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.Toast;
 
 public class TaskActivity extends ListActivity {
 	
@@ -15,15 +29,34 @@ public class TaskActivity extends ListActivity {
 	private String[] tasks;
 	private int cont;
 	
+	//He de calcular otra vez la temperatura, ya que es posible que solo 
+	//utilice esta actividad de la aplicación, posteriormente investigaré una manera
+	//de asegurarse que no hay que hacerlo dos veces, si cambio entre esta actividad y 
+	//BonsaiActivity
+	private ProgressDialog dialog;
+	private String location;
+	private boolean flagWeather=false;
+	private long idtemp;
+	private Weather w;
+	private List<Weather> weather;
+	private Button m_btnAlarma = null;
+	private static PendingIntent pendingIntent;
+	private static final int ALARM_REQUEST_CODE = 1;
+	
     /** Called when the activity is first created. */
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.task);
         
+        m_btnAlarma = ((Button)findViewById(R.id.btnAlarm));
+        m_btnAlarma.setOnClickListener(
+                new View.OnClickListener() {
+                    public void onClick(View view) {
+                        CambiarEstadoAlarma();
+                    }});
+        
         
-     
-
      //   ListView lv = getListView();
      //   lv.setTextFilterEnabled(true);
 
@@ -45,8 +78,19 @@ public void onResume() {
            cont = 0;
            
            bonsaisCursor.moveToFirst();
+           
            for(int i = 0; i < bonsaisCursor.getCount(); i++) {
            	long id = bonsaisCursor.getLong(bonsaisCursor.getColumnIndexOrThrow(BonsaiDbUtil.KEY_ROWID));
+           	
+            //si la localización del siguiente bonsai, es la misma que este no
+  			//vuelvo a calcular la temperatura
+           	Cursor bonsai = bonsaidb.fetchBonsai(id);
+  			startManagingCursor(bonsai);
+           	if(location!=bonsai.getString(bonsai.getColumnIndexOrThrow(BonsaiDbUtil.KEY_LOCALIZATION)))
+           		flagWeather=false;
+           	if(flagWeather==false);
+           		checkTemp(id);
+           	
            	String possibletask = checkWater(id);
            	if(possibletask != null) {
            		tasks[cont] = possibletask;
@@ -89,7 +133,6 @@ private String checkWater(long id) {
     	long lastwatered;
     	long waterfrec;
     	int height = 30;
-    	int temperature = 20;
     	long hoursTime = (new Date().getTime())/(1000*60*60);
     	
 
@@ -108,8 +151,8 @@ private String checkWater(long id) {
         	// LOGICA DE REGADO
         	
         	if(lastwatered == 0) return ("Set water info on " + name);
-        	else if(temperature > 35) return("Water " + name + " 2 times with " + height/4 + " cl.");
-        	else if(temperature < 0) return null;
+        	else if(w.getTempMedia() > 35) return("Water " + name + " 2 times with " + height/4 + " cl.");
+        	else if(w.getTempMedia() < 0) return null;
         	else if((hoursTime - lastwatered) > waterfrec) return("Water " + name + " today once with " + height/2 +" cl.");
         	else return null;
         	
@@ -187,7 +230,7 @@ private String checkPode(long id) {
         	
         	// LOGICA DE TRANSPLANTE
         	if(lastpode == 0) return("Set info about " + name + " prunes.");
-        	else if(age < 2) {	// Los bonsais con menos de dos a–os se suelen defoliar al 50% cada 2 meses, aprox
+        	else if(age < 2) {	// Los bonsais con menos de dos a�os se suelen defoliar al 50% cada 2 meses, aprox
         		if(hoursTime - lastpode > 60 * 24) return("Defoliate " + name + " 50%");
         		else return null;
         	}
@@ -199,4 +242,141 @@ else if(age < 2) {	// Los bonsais con menos de dos a
         	return null;
         }	
     }
+    
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.menu, menu);
+        return true;
+    }
+    
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.MnuOpc1:
+            	Toast.makeText(this,"Displays the daily care of your bonsai. Press Alarm ON / OFF to enable / disable notifications for the taskbar of your device", Toast.LENGTH_LONG).show();
+                return true;
+
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+    
+
+    
+    private void checkTemp(long id) {
+      	dialog = ProgressDialog.show(this, "", "Data obtaining…", true);
+      	idtemp=id;
+      	
+      	Thread thread = new Thread() {
+      		@Override
+      		public void run() {
+      			try{
+      			Cursor bonsai = bonsaidb.fetchBonsai(idtemp);
+      			startManagingCursor(bonsai);	
+      			location = bonsai.getString(bonsai.getColumnIndexOrThrow(BonsaiDbUtil.KEY_LOCALIZATION));
+      	        XmlParserSax saxparser =  new XmlParserSax("http://www.google.com/ig/api?weather="+location);
+      	      dialog.dismiss();
+      	        weather = saxparser.parse();
+      	        w=weather.get(0);
+      	        System.out.println("La temperatura de w es " +w.getTempMax());
+      				
+      			}catch(Exception e){
+      				Toast tx;
+      				System.out.println(e.toString());
+      				tx = Toast.makeText(getApplicationContext(), "Conexion is not aviable", Toast.LENGTH_LONG);
+      			    tx.show();
+      			  dialog.dismiss();
+      			}
+      			dialog.dismiss();
+      		}
+
+      		
+      	};
+      	thread.start();	
+        flagWeather=true;
+    	
+   	
+    }
+    
+    
+    /**
+     * Desactiva o activa la alarma, estableciendola al estado contrario del actual
+     */
+    private void CambiarEstadoAlarma()
+    {
+        if (pendingIntent == null)
+        {
+            //La alarma está desactivada, la activamos
+            ActivarAlarma();
+        }else
+        {
+            //La alarma está activada, la desactivamos
+            DesactivarAlarma();
+        }
+    }
+    
+    private void DesactivarAlarma()
+    {
+    //     AlarmManager alarmManager = (AlarmManager)getSystemService(ALARM_SERVICE);
+      //   alarmManager.cancel(pendingIntent);
+ 
+         m_btnAlarma.setText("Alarm OFF");
+         pendingIntent = null;
+ 
+         Toast.makeText(TaskActivity.this, "Notifications is OFF", Toast.LENGTH_LONG).show();
+ 
+    }
+    
+    /**
+     * Activa la alarma
+     */
+    private void ActivarAlarma()
+    {
+    
+   	
+          AlarmManager manager = (AlarmManager) this.getSystemService(Context.ALARM_SERVICE);
+    	  Intent 	 	 intent  = new Intent(this, MyReceiver.class);
+          PendingIntent pIntent = PendingIntent.getBroadcast(this, ALARM_REQUEST_CODE, intent,  PendingIntent.FLAG_CANCEL_CURRENT);
+   
+      //   Código que salta una notificación en 5 segundos para comprobar su funcionamiento!!
+      //    Para que funcione la demo de notificación en 5 segundos hay que comentar la otra
+      //    int comprobacionIntervaloSegundos = 5;
+      //    manager.set(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + comprobacionIntervaloSegundos * 1000, pIntent);
+            manager.set(AlarmManager.RTC_WAKEUP, checkWaterNotification(), pIntent);
+          
+          m_btnAlarma.setText("Alarm ON");
+ 
+          Toast.makeText(TaskActivity.this, "Notification is ON", Toast.LENGTH_LONG).show();
+ 
+    }
+    
+    private long checkWaterNotification() {
+    	 long riego = 0;
+    	 Cursor bonsaisCursor = bonsaidb.fetchAllBonsais();
+         startManagingCursor(bonsaisCursor);
+         bonsaisCursor.moveToFirst();
+         for(int i = 0; i < bonsaisCursor.getCount(); i++) {
+        	  	long id = bonsaisCursor.getLong(bonsaisCursor.getColumnIndexOrThrow(BonsaiDbUtil.KEY_ROWID));
+               	Cursor bonsai = bonsaidb.fetchBonsai(id);
+      			startManagingCursor(bonsai);
+      			long lastWater = bonsaisCursor.getLong(bonsaisCursor.getColumnIndexOrThrow(BonsaiDbUtil.KEY_LAST_WATER));
+      			String family = bonsai.getString(bonsai.getColumnIndexOrThrow(BonsaiDbUtil.KEY_FAMILY));
+      			Cursor cfamily = familydb.fetchFamilybyName(family);
+            	startManagingCursor(cfamily);
+            	long waterfrec = cfamily.getInt(cfamily.getColumnIndexOrThrow(FamilyDbUtil.KEY_WATER_FRECUENCY));
+            	long proxriego=lastWater+waterfrec;
+            	if(i==0) riego=proxriego;
+            	else if(proxriego<riego) riego=proxriego;
+      			if(i < bonsaisCursor.getCount()-1) bonsaisCursor.moveToNext();
+         
+         }
+         System.out.println("Ahora son las "+System.currentTimeMillis()/(1000*60*60));
+         System.out.println("La notificación del riego será a las "+riego);
+         return riego*1000*60*60;
+         
+    	
+    	
+    }
+    
 }
\ No newline at end of file
diff --git a/src/bonsai/app/alarm/AlarmChecker.java b/src/bonsai/app/alarm/AlarmChecker.java
new file mode 100644
index 0000000..e3c1fc8
--- /dev/null
+++ b/src/bonsai/app/alarm/AlarmChecker.java
@@ -0,0 +1,113 @@
+package bonsai.app.alarm;
+
+
+import bonsai.app.*;
+
+import android.app.NotificationManager;
+import android.app.Service;
+import android.content.Intent;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Message;
+
+import android.app.Notification;
+
+import android.app.PendingIntent;
+
+import android.util.Log;
+
+
+
+public class AlarmChecker extends Service  implements Runnable {
+	 
+public static final int APP_ID_NOTIFICATION = 0;
+private NotificationManager mManager;
+
+ 
+private final int MSG_KEY_NOTIFOFF = 1;
+private final int MSG_KEY_NOTIFOK = 2;
+ 
+/**
+ * Método del hilo asíncrono, que revisa las tareas y comprueba si hay alguna para mostrar
+ */
+public void run() {
+	
+	CheckRiego c = null;
+	boolean b=c.check();
+	b=true;
+ 
+    System.out.println("se comprobaron las tareas y el resultado fué " + b);
+    if (b==false)
+        //Respondemos que no hay tareas
+        handler.sendEmptyMessage(MSG_KEY_NOTIFOFF);
+    else{
+        handler.sendEmptyMessage(MSG_KEY_NOTIFOK);
+    }
+}
+ 
+
+
+/**
+ * Procesa eventos desde el hilo run
+ */
+private Handler handler = new Handler() {
+    @Override
+    public void handleMessage(Message msg) {
+            switch (msg.what){
+            case MSG_KEY_NOTIFOK: //Hemos obtenido que hay tareas pendientes
+                 Notificar();
+                break;
+            }
+    }
+};
+ 
+/**
+ * prepara y lanza la notificacion
+ */
+private void Notificar() {
+ 
+    //Prepara la actividad que se abrira cuando el usuario pulse la notificacion
+        Intent intentNot = new Intent(this, TaskActivity.class);
+ 
+    //Prepara la notificacion
+        Notification notification = new Notification(R.drawable.bonsai, "Hay cambios", System.currentTimeMillis());
+        notification.setLatestEventInfo(this, getString(R.string.app_name), "Notificación de Bonsai Cares",
+                PendingIntent.getActivity(this.getBaseContext(), 0, intentNot, PendingIntent.FLAG_CANCEL_CURRENT));
+ 
+    //Le añade sonido
+        notification.defaults |= Notification.DEFAULT_SOUND;
+    //Le añade vibración
+        notification.defaults |= Notification.DEFAULT_VIBRATE;
+ 
+    //Le añade luz mediante LED
+        notification.defaults |= Notification.DEFAULT_LIGHTS;
+ 
+    //La notificación se detendrá cuando el usuario pulse en ella
+        notification.flags = Notification.FLAG_AUTO_CANCEL;
+ 
+    //Intenta establecer el color y el parpadeo de la bombilla lED
+        try
+        {
+            notification.ledARGB = 0xff00ff00;
+            notification.ledOnMS = 300;
+            notification.ledOffMS = 1000;
+            notification.flags |= Notification.FLAG_SHOW_LIGHTS;
+        }catch(Exception ex)
+        {
+            //Nothing
+        }
+ 
+        //Lanza la notificación
+        mManager.notify(APP_ID_NOTIFICATION, notification);
+ 
+     }
+
+@Override
+public IBinder onBind(Intent intent) {
+	// TODO Auto-generated method stub
+	return null;
+}
+ 
+      //interface events
+ 
+}
\ No newline at end of file
diff --git a/src/bonsai/app/alarm/CheckRiego.java b/src/bonsai/app/alarm/CheckRiego.java
new file mode 100644
index 0000000..3bfbb19
--- /dev/null
+++ b/src/bonsai/app/alarm/CheckRiego.java
@@ -0,0 +1,114 @@
+package bonsai.app.alarm;
+
+import bonsai.app.BonsaiDbUtil;
+import bonsai.app.FamilyDbUtil;
+import android.app.ListActivity;
+import android.database.Cursor;
+import java.util.Date;
+import java.util.List;
+import bonsai.app.weather.Weather;
+import bonsai.app.weather.XmlParserSax;
+import android.widget.Toast;
+
+/**
+ * 
+ * @author ruben y raul
+ * Clase que contiene un método que calcula para los bonsais de la tabla si
+ * tienen alguna tarea pendiente relaccionada con el riego
+ * 
+ *
+ */
+
+public class CheckRiego extends ListActivity {
+	
+	private Weather w;
+	private List<Weather> weather;
+	BonsaiDbUtil bonsaidb;
+	FamilyDbUtil familydb;
+	
+	/**
+	 * Método encargado de verificar si los bonsais tienen 
+	 * tareas pendientes
+	 * @return true si hay tareas pendientes y false en caso contrario
+	 * 
+	 */
+	
+	public boolean check(){
+	 bonsaidb = new BonsaiDbUtil(this);	// Construinos el DDBBAdapter
+     bonsaidb.open();
+     familydb = new FamilyDbUtil(this);	// Construinos el DDBBAdapter
+     familydb.open();
+     
+
+     Cursor bonsaisCursor = bonsaidb.fetchAllBonsais();
+     startManagingCursor(bonsaisCursor);
+     String[] tasks = new String[bonsaisCursor.getCount() * 3];
+     int cont = 0;
+     
+     bonsaisCursor.moveToFirst();
+     for(int i = 0; i < bonsaisCursor.getCount(); i++) {
+        	long id = bonsaisCursor.getLong(bonsaisCursor.getColumnIndexOrThrow(BonsaiDbUtil.KEY_ROWID));
+        	String possibletask = checkWater(id);
+        	if(possibletask != null) {
+        		tasks[cont] = possibletask;
+        		cont++;
+        	}
+        	if(i < bonsaisCursor.getCount()-1) bonsaisCursor.moveToNext();
+        	}
+     		int cuenta = 0;
+     		for(int i = 0; i < tasks.length; i++) {
+     		if(tasks[i] != null) cuenta++;
+     		}
+     		if (cuenta==0)return false;
+     		else return true;
+     				
+	}
+	
+	
+	
+	
+	
+	private String checkWater(long id) {
+    	String name;
+    	String family;
+    	long lastwatered;
+    	long waterfrec;
+    	int height = 30;
+    	long hoursTime = (new Date().getTime())/(1000*60*60);
+   
+    	
+
+        try {
+        	Cursor bonsai = bonsaidb.fetchBonsai(id);
+        	startManagingCursor(bonsai);
+        	name = bonsai.getString(bonsai.getColumnIndexOrThrow(BonsaiDbUtil.KEY_NAME));
+        	family = bonsai.getString(bonsai.getColumnIndexOrThrow(BonsaiDbUtil.KEY_FAMILY));
+        	lastwatered = bonsai.getInt(bonsai.getColumnIndexOrThrow(BonsaiDbUtil.KEY_LAST_WATER));
+        	height = bonsai.getInt(bonsai.getColumnIndexOrThrow(BonsaiDbUtil.KEY_HEIGHT));
+        	
+        	Cursor cfamily = familydb.fetchFamilybyName(family);
+        	startManagingCursor(cfamily);
+        	waterfrec = cfamily.getInt(cfamily.getColumnIndexOrThrow(FamilyDbUtil.KEY_WATER_FRECUENCY));
+        	
+        	
+        
+        	
+        	// LOGICA DE REGADO
+        	
+        	if(lastwatered == 0) return ("Set water info on " + name);
+        	else if(w.getTempMax() > 35) return("Water " + name + " 2 times with " + height/4 + " cl.");
+        	else if(w.getTempMedia() < 0) return null;
+        	else if((hoursTime - lastwatered) > waterfrec) return("Water " + name + " today once with " + height/2 +" cl.");
+        	else return null;
+ 
+        	
+        } catch(Exception e) {
+        	System.out.println(e.toString());
+        	return null;
+        }
+		
+    	
+    }
+	
+ 
+}
diff --git a/src/bonsai/app/weather/Weather.java b/src/bonsai/app/weather/Weather.java
index fdac95d..7104b87 100644
--- a/src/bonsai/app/weather/Weather.java
+++ b/src/bonsai/app/weather/Weather.java
@@ -1,39 +1,47 @@
 package bonsai.app.weather;
 
 public class Weather {
-	
+
 	private int tempMax;
-    private int tempMin;
-    private double tempMediaC;
-    private String icon;
-	public int getTempMax() {
-		return tempMax;
+	private int tempMin;
+	private double tempMediaC;
+	private String icon;
+
+	public double getTempMax() {
+		double t = (tempMax - 32) / 1.8;
+		return t;
 	}
+
 	public void setTempMax(int tempMax) {
 		this.tempMax = tempMax;
-		
+
 	}
-	public int getTempMin() {
-		return tempMin;
+
+	public double getTempMin() {
+		double t = (tempMin - 32) / 1.8;
+		return t;
 	}
+
 	public void setTempMin(int tempMin) {
 		this.tempMin = tempMin;
 	}
-	public double getTempMedia() {
-		int tempMedia=(tempMax+tempMin)/2;
-		tempMediaC=5*tempMedia/9;
-		return tempMediaC;
-		
+
+	public int getTempMedia() {
+		double t1 = (tempMax - 32) / 1.8;
+		System.out.println("tempMax es " + tempMax + " y en C es " + t1);
+		double t2 = (tempMin - 32) / 1.8;
+		System.out.println("tempMin es " + tempMin + " y en C es " + t2);
+		tempMediaC = (t1 + t2) / 2;
+		return (int) tempMediaC;
+
 	}
+
 	public String getIcon() {
 		return icon;
 	}
+
 	public void setIcon(String icon) {
 		this.icon = icon;
 	}
-	
-	
-
-	
 
 }
diff --git a/src/bonsai/app/weather/XmlHandler.java b/src/bonsai/app/weather/XmlHandler.java
index 3dc235d..56ae51e 100644
--- a/src/bonsai/app/weather/XmlHandler.java
+++ b/src/bonsai/app/weather/XmlHandler.java
@@ -32,7 +32,7 @@ public void startElement (String uri, String name, String qName, Attributes atts
     if(qName.compareToIgnoreCase("high") == 0) {
     int high = Integer.parseInt(atts.getValue(0));
     System.out.println("High: " + high);
-    weatherActual.setTempMin(high);
+    weatherActual.setTempMax(high);
     }
     if(qName.compareToIgnoreCase("icon") == 0) {
     	if(n>0){