diff --git a/src/user_code.cpp b/src/user_code.cpp
index f548bdc..da86b04 100644
--- a/src/user_code.cpp
+++ b/src/user_code.cpp
@@ -1,6 +1,6 @@
 #include <user_code.hpp>
 
-uint8_t user_acmode = 0;
+uint8_t user_acmode = 1;
 // Display Componets
 // Link with Dual state button object with id 2 on page 1 named bt0
 NexButton light_toggle = NexButton(1,2,"light_toggle");
@@ -143,13 +143,20 @@ void mode_pop_callback(void *ptr)
 void ac_toggle_pop_callback(void *ptr)
 {
     //this function should set the state of the AC to toggle between off (mode 0) and the same state as before store in variable acmode
+    //val user_acmode already initialized to 1 (cool mode)
     if (ac_get_mode() == 0) {
         ac_set_state(user_acmode, ac_get_temperature(), ac_get_fan_speed());
     } else {
         user_acmode = ac_get_mode();
         ac_set_state(0, ac_get_temperature(), ac_get_fan_speed());
     }
-
+    /* if (ac_get_mode() == 0) {
+        //ac_set_state(user_acmode, ac_get_temperature(), ac_get_fan_speed());
+    } else {
+        user_acmode = ac_get_mode();
+        ac_set_state(0, ac_get_temperature(), ac_get_fan_speed());
+    }
+ */
 }
 
 void row1_master_pop_callback(void *ptr)
@@ -417,7 +424,48 @@ void update_lcd_ac() {
     uint8_t mode_state = ac_get_mode();
     //mode.Set_background_image_pic(mode_state==1?22:24);
     elcd_send_stop_bit();
-    elcd.print("mode.pic=");
+    if(mode_state==1){
+        elcd_send_stop_bit();
+        elcd.print("ac_toggle.pic=2");
+        elcd_send_stop_bit();
+        elcd.print("ac_toggle.pic2=2");
+        elcd_send_stop_bit();
+        elcd.print("mode.pic=22");
+        elcd_send_stop_bit();
+        elcd.print("mode.pic2=22");
+        elcd_send_stop_bit();
+
+    } else if(mode_state==2){
+        elcd_send_stop_bit();
+        elcd.print("ac_toggle.pic=2");
+        elcd_send_stop_bit();
+        elcd.print("ac_toggle.pic2=2");
+        elcd_send_stop_bit();
+        elcd.print("mode.pic=24");
+        elcd_send_stop_bit();
+        elcd.print("mode.pic2=24");
+        elcd_send_stop_bit();
+    } else{
+        elcd_send_stop_bit();
+        elcd.print("ac_toggle.pic=1");
+        elcd_send_stop_bit();
+        elcd.print("ac_toggle.pic2=1");
+        if(user_acmode==1){
+            elcd_send_stop_bit();
+            elcd.print("mode.pic=22");
+            elcd_send_stop_bit();
+            elcd.print("mode.pic2=22");
+            elcd_send_stop_bit();
+        }
+        else{
+        elcd_send_stop_bit();
+        elcd.print("mode.pic=24");
+        elcd_send_stop_bit();
+        elcd.print("mode.pic2=24");
+        elcd_send_stop_bit();
+        }
+    }
+    /* elcd.print("mode.pic=");
     elcd.print(mode_state==1?22:24);
     elcd_send_stop_bit();
     elcd.print("mode.pic2=");
@@ -431,7 +479,7 @@ void update_lcd_ac() {
     elcd_send_stop_bit();
     elcd.print("ac_toggle.pic2=");
     elcd.print(ac_get_mode()==0?2:1);
-    elcd_send_stop_bit();
+    elcd_send_stop_bit(); */
 }