diff --git a/src/ups_with_timeout.py b/src/ups_with_timeout.py
new file mode 100644
index 0000000..8893406
--- /dev/null
+++ b/src/ups_with_timeout.py
@@ -0,0 +1,87 @@
+#!/usr/bin/python
+
+import time
+import os, sys
+import logging
+import socket
+import json
+import signal
+from powerpi import Powerpi
+
+logging.basicConfig(level=logging.INFO)
+GPIO4_AVAILABLE = True
+
+try:
+    import RPi.GPIO as GPIO   
+except :
+    GPIO4_AVAILABLE = False
+    logging.error("Error importing GPIO library, UPS will work without interrupt")
+
+ENABLE_UDP = True
+UDP_PORT = 40001
+serverAddressPort   = ("127.0.0.1", UDP_PORT)
+UDPClientSocket = socket.socket(family=socket.AF_INET, type=socket.SOCK_DGRAM)
+disconnectflag = False
+ppi = Powerpi()
+
+TIMEOUT = 100 #timeout to shutdown in seconds
+counter = 0
+
+def read_status(clear_fault=False):
+        global disconnectflag, ENABLE_UDP, counter, TIMEOUT
+        err, status = ppi.read_status(clear_fault)
+        
+        if err:
+            time.sleep(1)
+            return
+
+        if status["PowerInputStatus"] == "Not Connected" and disconnectflag == False :
+            disconnectflag = True
+            message = "echo Power Disconnected, system will shutdown in %d minutes! | wall" % (status['TimeRemaining'])
+            os.system(message)
+        
+        if status["PowerInputStatus"] == "Connected" and disconnectflag == True :
+            disconnectflag = False
+            message = "echo Power Restored, battery at %d percent | wall" % (status['BatteryPercentage'])
+            os.system(message)
+            counter = 0
+        
+        if ENABLE_UDP:
+            try:
+                UDPClientSocket.sendto(json.dumps(status,indent=4,sort_keys=True), serverAddressPort)
+            except Exception as ex:
+                logging.error(ex)
+        
+        logging.debug(status)
+        
+        if(status['BatteryVoltage'] < ppi.VBAT_LOW):
+                ppi.bat_disconnect()
+                os.system('sudo shutdown now')
+        
+        if disconnectflag:
+            if counter > TIMEOUT:
+                ppi.bat_disconnect()
+                os.system('sudo shutdown now')
+            counter = counter +2
+
+def interrupt_handler(channel):
+    read_status(True) 
+
+def main():
+    if ppi.initialize():
+        sys.exit(1)
+
+    if GPIO4_AVAILABLE:
+        try:
+            GPIO.setmode(GPIO.BCM)
+            GPIO.setup(4, GPIO.IN, pull_up_down=GPIO.PUD_UP)
+            GPIO.add_event_detect(4, GPIO.FALLING, callback=interrupt_handler, bouncetime=200)
+        except Exception as ex:
+            logging.error("Error attaching interrupt to GPIO4, UPS will work without interrupt.")
+        
+    while (True):
+        read_status()
+
+if __name__=="__main__":
+    main()
+