diff --git a/ipaacatools/scripts/ipaaca-iu-injector.py b/ipaacatools/scripts/ipaaca-iu-injector.py
index 102a3c5440e42964c40abc1f209625e688cc0cfe..6d7fa44fdab6a08519b188496a9f9e3b49bb9071 100755
--- a/ipaacatools/scripts/ipaaca-iu-injector.py
+++ b/ipaacatools/scripts/ipaaca-iu-injector.py
@@ -3,18 +3,33 @@
 import time
 import logging
 import ipaaca
+import sys
 
 def my_update_handler(iu, event_type, local):
 	print(event_type+': '+str(iu))
 
-ob = ipaaca.OutputBuffer('CoolInformerOut')
-ob.register_handler(my_update_handler)
+if len(sys.argv)<2:
+	print "Please use the program as follows:"
+	print " "+sys.argv[0]+" <categoryname> [<payloadkey> <payloadvalue>] [<k2> <v2>] ..."
+	sys.exit(1)
+
+cate = sys.argv[1]
+idx=2
+pl={}
+while len(sys.argv)>idx+1:
+	pl[sys.argv[idx]] = sys.argv[idx+1]
+	idx+=2
 
-iu_top = ipaaca.IU('murmlfile')
-iu_top.payload = {'data': 'HalloTest.us'}
-#iu_top.payload = {'data': 'smile_7sec.us'}
+print "Sending Message of category "+cate
+print " with payload "+str(pl)
+
+ob = ipaaca.OutputBuffer('IUInjector')
+ob.register_handler(my_update_handler)
+iu_top = ipaaca.Message(cate)
+iu_top.payload = pl
 ob.add(iu_top)
+print "Message sent."
 
-time.sleep(1)
-print "Done"
+time.sleep(0.3)
+print "done."
 
diff --git a/ipaacatools/scripts/ipaaca-iu-sniffer.py b/ipaacatools/scripts/ipaaca-iu-sniffer.py
index f5798abd2ddee62397f78b5bf4862b8a09660934..015becde6aea5fae0df55d72ad622ae6ee949bfc 100755
--- a/ipaacatools/scripts/ipaaca-iu-sniffer.py
+++ b/ipaacatools/scripts/ipaaca-iu-sniffer.py
@@ -3,16 +3,21 @@
 import time
 import logging
 import ipaaca
+import sys
 
 def my_update_handler(iu, event_type, local):
 	t=time.localtime()
 	print str(t.tm_hour)+':'+str(t.tm_min)+':'+str(t.tm_sec),
 	print(event_type+': '+unicode(iu))
 
-ib = ipaaca.InputBuffer('SnifferIn', [''])
+cats = []
+if len(sys.argv)>1:
+	cats = sys.argv[1:]
+
+ib = ipaaca.InputBuffer('SnifferIn', [''] if len(cats)==0 else cats)
 ib.register_handler(my_update_handler)
 
-print("Listening for IU events of any category...")
+print("Listening for IU events of "+("any category..." if len(cats)==0 else "categories: "+' '.join(cats)))
 print('')
 while True:
 	time.sleep(1)