diff --git a/watering.py b/watering.py
index 3bee1c8..f9f1061 100755
--- a/watering.py
+++ b/watering.py
@@ -14,60 +14,56 @@
 client = paho.Client(paho.CallbackAPIVersion.VERSION2)
 client.connect("stanley")
 
-Watering = namedtuple('Watering', 'voltage moisture intervals dry wet state delay_hours max_time_mins pump_speed pump_running errors')
-WateringStruct = '<HHHHHBBBB?B'
+Watering = namedtuple('Watering', 'voltage moisture pump_speed pump_running errors')
+WateringStruct = '<HHB?B'
+
+Command = namedtuple('Command', 'proc arg')
+CommandStruct = '<BB'
 
 class WaterActor(pykka.ThreadingActor):
     def __init__(self, client):
         super().__init__()
         self.client = client
-        self.state = None
-        self.updates = []
+        self.cmds = []
 
     def greenhouse(self, payload):
         try:
             message = Watering._make(unpack(WateringStruct, payload.message))
-            self.state = message
             to_send = message._asdict()
             to_send['rssi'] = payload.rssi
             to_send['snr'] = payload.snr
             client.publish('events/greenhouse', payload=json.dumps(to_send))
         except Exception as e:
             client.publish('events/greenhouse', payload=str(e))
-        updated_state = self.state
-        for update in self.updates:
-            updated_state = updated_state._replace(**update)
-        self.updates = []
-        if self.state != updated_state:
-            reply = pack(WateringStruct, *updated_state)
-            print("Sending: " + str(updated_state))
-            lora.send(reply, 2)
+        if len(self.cmds) > 0:
+            time.sleep(0.5)
+            for cmd in self.cmds:
+                print("Sending: " + str(cmd))
+                try:
+                    reply = pack(CommandStruct, *cmd)
+                    print(reply)
+                    lora.send(reply, 2)
+                except Exception as e:
+                    print(e)
+            self.cmds.clear()
             lora.set_mode_rx()
 
-    def queue_update(self, update):
-        self.updates.append(update)
+    def queue_command(self, command):
+        self.cmds.append(command)
 
 a = WaterActor.start(client).proxy()
 
 class SprinklerHTTPRequestHandler(BaseHTTPRequestHandler):
     def do_GET(self):
-        current_state = a.state.get()
         self.send_response(200)
         self.send_header("Content-type", "text/plain")
         self.end_headers()
         self.flush_headers()
         if self.path == '/on':
-            a.queue_update({
-                'state': 0,
-                'intervals': current_state.delay_hours * 360 + 1
-            })
+            a.queue_command(Command(1, 248))
             self.wfile.write(bytes("Switching pump on", "utf-8"))
         elif self.path == '/off':
-            a.queue_update({
-                'state': 1,
-                'intervals': 0,
-                'wet': current_state.moisture + 1
-            })
+            a.queue_command(Command(0, 0))
             self.wfile.write(bytes("Switching pump off", "utf-8"))
 
 httpd = HTTPServer(('', 80), SprinklerHTTPRequestHandler)