diff --git a/tools/dpt b/tools/dpt
index dca5fee..a3945bc 100755
--- a/tools/dpt
+++ b/tools/dpt
@@ -1,57 +1,17 @@
 #!/usr/bin/env python3
 
-#
-# Fake depth gauge (sending DPT) 
-#
+import time, random, sys
+sys.path.append ('../lib')
+from nmeaSender import NmeaSender
+from nmea0183 import DPT
 
-import socket, sys, pynmea2, time, random
+nS = NmeaSender(sys.argv)
 
-###### main #####
-if(len(sys.argv) < 2):
-    print("Usage : " + sys.argv[0] + " port [IP]")
-    sys.exit()
-
-PORT = int(sys.argv[1])
-if len(sys.argv) == 3:
-    HOST = sys.argv[2]
-else:
-    HOST = "0.0.0.0"
-
-RECV_BUFFER = 4096 # Advisable to keep it as an exponent of 2
-
-# Connect to multiplexer
-print("Connecting to multiplexer (" + HOST + ":" + str(PORT) + ")")
-try:
-    s = socket.socket()
-    s.connect((HOST,PORT))
-except:
-    print("Error while connecting.")
-    sys.exit()
-
-print("DTP is now connected. Press Ctrl-C to quit.")
 while 1:
-    depth = random.randint(5,10)
-    try:
-        msg = str(pynmea2.DPT('YX','DPT', (str(depth), str(0.7))))+"\n"
-    except:
-        print
-        print("Error while encoding NMEA message.")
-        sys.exit()
-        s.close()
-    try:
-        s.send(bytes(msg, 'ASCII'))
-    except Exception:
-        print
-        print("Error while sending NMEA message: %" % Exception)
-        s.close()
-        sys.exit()
-
+    nS.send(DPT().encode(str(random.randint(5,10)), '0.7'))
     try:
         time.sleep(1)
     except:
-        print
-        print("Disconnected.")
-        s.close()
-        sys.exit()
+        nS.terminate()
 
 # EOF