diff --git a/src/main.cpp b/src/main.cpp
index f29135c..d431d35 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -127,9 +127,9 @@ void setup()
   espmega.setTimezone("ICT-7");
  
   // set debounce time to 500 for pin 0-11
-  for (uint16_t i = 0; i < 12; i++)
+  for (uint16_t i = 0; i < 16; i++)
   {
-    espmega.inputs.setDebounceTime(i, 500);
+    espmega.inputs.setDebounceTime(i, 1000);
   } 
 
   // ------------ IoT Module Initialization Routine ------------
@@ -392,36 +392,36 @@ void loop()
 
 void on_pin_change(uint8_t pin, uint8_t value)
 {
-  // switch (pin)
-  // {
-  // case LIGHT_ROW1_COLUMN1_IN:
-  //   espmega.outputs.setState(LIGHT_ROW1_COLUMN1, !espmega.outputs.getState(LIGHT_ROW1_COLUMN1));
-  //   break;
-  // case LIGHT_ROW1_COLUMN2_IN:
-  //   espmega.outputs.setState(LIGHT_ROW1_COLUMN2, !espmega.outputs.getState(LIGHT_ROW1_COLUMN2));
-  //   break;
-  // case LIGHT_ROW2_COLUMN1_IN:
-  //   espmega.outputs.setState(LIGHT_ROW2_COLUMN1, !espmega.outputs.getState(LIGHT_ROW2_COLUMN1));
-  //   break;
-  // case LIGHT_ROW2_COLUMN2_IN:
-  //   espmega.outputs.setState(LIGHT_ROW2_COLUMN2, !espmega.outputs.getState(LIGHT_ROW2_COLUMN2));
-  //   break;
-  // case LIGHT_ROW3_COLUMN1_IN:
-  //   espmega.outputs.setState(LIGHT_ROW3_COLUMN1, !espmega.outputs.getState(LIGHT_ROW3_COLUMN1));
-  //   break;
-  // case LIGHT_ROW3_COLUMN2_IN:
-  //   espmega.outputs.setState(LIGHT_ROW3_COLUMN2, !espmega.outputs.getState(LIGHT_ROW3_COLUMN2));
-  //   break;
-  // case LIGHT_ROW4_COLUMN1_IN:
-  //   espmega.outputs.setState(LIGHT_ROW4_COLUMN1, !espmega.outputs.getState(LIGHT_ROW4_COLUMN1));
-  //   break;
-  // case LIGHT_ROW4_COLUMN2_IN:
-  //   espmega.outputs.setState(LIGHT_ROW4_COLUMN2, !espmega.outputs.getState(LIGHT_ROW4_COLUMN2));
-  //   break;
-  // case COMPUTER_DESK_SWITCH_IN:
-  //   espmega.outputs.setState(COMPUTER_DESK_SWITCH_OUT, !espmega.outputs.getState(COMPUTER_DESK_SWITCH_OUT));
-  //   break;
-  // }
+  switch (pin)
+  {
+  case LIGHT_ROW1_COLUMN1_IN:
+    espmega.outputs.setState(LIGHT_ROW1_COLUMN1, !espmega.outputs.getState(LIGHT_ROW1_COLUMN1));
+    break;
+  case LIGHT_ROW1_COLUMN2_IN:
+    espmega.outputs.setState(LIGHT_ROW1_COLUMN2, !espmega.outputs.getState(LIGHT_ROW1_COLUMN2));
+    break;
+  case LIGHT_ROW2_COLUMN1_IN:
+    espmega.outputs.setState(LIGHT_ROW2_COLUMN1, !espmega.outputs.getState(LIGHT_ROW2_COLUMN1));
+    break;
+  case LIGHT_ROW2_COLUMN2_IN:
+    espmega.outputs.setState(LIGHT_ROW2_COLUMN2, !espmega.outputs.getState(LIGHT_ROW2_COLUMN2));
+    break;
+  case LIGHT_ROW3_COLUMN1_IN:
+    espmega.outputs.setState(LIGHT_ROW3_COLUMN1, !espmega.outputs.getState(LIGHT_ROW3_COLUMN1));
+    break;
+  case LIGHT_ROW3_COLUMN2_IN:
+    espmega.outputs.setState(LIGHT_ROW3_COLUMN2, !espmega.outputs.getState(LIGHT_ROW3_COLUMN2));
+    break;
+  case LIGHT_ROW4_COLUMN1_IN:
+    espmega.outputs.setState(LIGHT_ROW4_COLUMN1, !espmega.outputs.getState(LIGHT_ROW4_COLUMN1));
+    break;
+  case LIGHT_ROW4_COLUMN2_IN:
+    espmega.outputs.setState(LIGHT_ROW4_COLUMN2, !espmega.outputs.getState(LIGHT_ROW4_COLUMN2));
+    break;
+  case COMPUTER_DESK_SWITCH_IN:
+    espmega.outputs.setState(COMPUTER_DESK_SWITCH_OUT, !espmega.outputs.getState(COMPUTER_DESK_SWITCH_OUT));
+    break;
+  }
 }
 
 uint16_t get_pm25_out()