diff --git a/transmit.py b/transmit.py
index 00ace912..093ca3a3 100644
--- a/transmit.py
+++ b/transmit.py
@@ -974,9 +974,11 @@ if __name__ == "__main__":
 					system("echo 'hi hi de " + callsign + status + "' > id.txt && gen_packets -M 20 /home/pi/CubeSatSim/id.txt -o /home/pi/CubeSatSim/morse.wav -r 48000 > /dev/null 2>&1 && sudo pinfm  --audio /home/pi/CubeSatSim/morse.wav --mode narrow --freq " + tx + "e6 > /dev/null 2>&1")
 			else:
 				if (debug_mode == 1):
-					system("echo 'hi hi de " + callsign + status + "' > id.txt && gen_packets -M 20 /home/pi/CubeSatSim/id.txt -o /home/pi/CubeSatSim/morse.wav -r 48000 > /dev/null 2>&1 && cat /home/pi/CubeSatSim/morse.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + txr + "e3")
-				else:
-					system("echo 'hi hi de " + callsign + status + "' > id.txt && gen_packets -M 20 /home/pi/CubeSatSim/id.txt -o /home/pi/CubeSatSim/morse.wav -r 48000 > /dev/null 2>&1 && cat /home/pi/CubeSatSim/morse.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + txr + "e3 > /dev/null 2>&1")
+		#			system("echo 'hi hi de " + callsign + status + "' > id.txt && gen_packets -M 20 /home/pi/CubeSatSim/id.txt -o /home/pi/CubeSatSim/morse.wav -r 48000 > /dev/null 2>&1 && cat /home/pi/CubeSatSim/morse.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + txr + "e3")
+					system("echo 'hi hi de " + callsign + status + "' > id.txt && gen_packets -M 20 /home/pi/CubeSatSim/id.txt -o /home/pi/CubeSatSim/morse.wav -r 48000 > /dev/null 2>&1 && sudo pinfm  --audio /home/pi/CubeSatSim/morse.wav --mode narrow --freq " + txr + "e6")
+					else:
+		#			system("echo 'hi hi de " + callsign + status + "' > id.txt && gen_packets -M 20 /home/pi/CubeSatSim/id.txt -o /home/pi/CubeSatSim/morse.wav -r 48000 > /dev/null 2>&1 && cat /home/pi/CubeSatSim/morse.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + txr + "e3 > /dev/null 2>&1")
+					system("echo 'hi hi de " + callsign + status + "' > id.txt && gen_packets -M 20 /home/pi/CubeSatSim/id.txt -o /home/pi/CubeSatSim/morse.wav -r 48000 > /dev/null 2>&1 && sudo pinfm  --audio /home/pi/CubeSatSim/morse.wav --mode narrow --freq " + txr + "e6 > /dev/null 2>&1")
 				
 			output(txLed, 0)
 	
@@ -1079,10 +1081,11 @@ if __name__ == "__main__":
 						else:
 							system("echo 'AMSAT-11>APCSS:010101/hi hi ' >> t.txt")
 							if (debug_mode == 1):
-								system("gen_packets -o /home/pi/CubeSatSim/telem.wav /home/pi/CubeSatSim/t.txt -r 48000 > /dev/null 2>&1 && cat /home/pi/CubeSatSim/telem.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + tx + "e3")
+#								system("gen_packets -o /home/pi/CubeSatSim/telem.wav /home/pi/CubeSatSim/t.txt -r 48000 > /dev/null 2>&1 && cat /home/pi/CubeSatSim/telem.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + tx + "e3")
+								system("gen_packets -o /home/pi/CubeSatSim/telem.wav /home/pi/CubeSatSim/t.txt -r 48000 > /dev/null 2>&1 && sudo pinfm  --audio /home/pi/CubeSatSim/telem.wav --mode narrow --freq " + tx + "e6")
 							else:
-								system("gen_packets -o /home/pi/CubeSatSim/telem.wav /home/pi/CubeSatSim/t.txt -r 48000 > /dev/null 2>&1 && cat /home/pi/CubeSatSim/telem.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + tx + "e3 > /dev/null 2>&1")
-					
+#								system("gen_packets -o /home/pi/CubeSatSim/telem.wav /home/pi/CubeSatSim/t.txt -r 48000 > /dev/null 2>&1 && cat /home/pi/CubeSatSim/telem.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + tx + "e3 > /dev/null 2>&1")
+								system("gen_packets -o /home/pi/CubeSatSim/telem.wav /home/pi/CubeSatSim/t.txt -r 48000 > /dev/null 2>&1 && sudo pinfm  --audio /home/pi/CubeSatSim/telem.wav --mode narrow --freq " + tx + "e6 > /dev/null 2>&1")					
 						sleep(0.1)  
 #						output (ptt, 1)
 #						output(pd, 0)
@@ -1146,9 +1149,12 @@ if __name__ == "__main__":
 	#								output (pd, 0)
 								else:
 									if (debug_mode == 1):
-										system("cat /home/pi/CubeSatSim/morse.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + tx + "e3")
+#										system("cat /home/pi/CubeSatSim/morse.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + tx + "e3")
+										system("sudo pinfm  --audio /home/pi/CubeSatSim/telem.wav --mode narrow --freq " + tx + "e6")	
 									else:
-										system("cat /home/pi/CubeSatSim/morse.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + tx + "e3 > /dev/null 2>&1")		
+#										system("cat /home/pi/CubeSatSim/morse.wav | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + tx + "e3 > /dev/null 2>&1")		
+										system("sudo pinfm  --audio /home/pi/CubeSatSim/telem.wav --mode narrow --freq " + tx + "e6 > /dev/null 2>&1")	
+
 								output(txLed, 0)
 								
 #						command_control_check()
@@ -1212,9 +1218,11 @@ if __name__ == "__main__":
 #							output(pd, 0)
 						else:	
 							if (debug_mode == 1):
-								system("cat /home/pi/CubeSatSim/sstv_image_2_320_x_256.jpg.wav | csdr convert_i16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + tx + "e3")
+	#							system("cat /home/pi/CubeSatSim/sstv_image_2_320_x_256.jpg.wav | csdr convert_i16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + tx + "e3")
+								system("sudo pinfm  --audio /home/pi/CubeSatSim/sstv_image_2_320_x_256.jpg.wav --mode narrow --freq " + tx + "e6")	
 							else:
-								system("cat /home/pi/CubeSatSim/sstv_image_2_320_x_256.jpg.wav | csdr convert_i16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + tx + "e3 > /dev/null 2>&1")
+#								system("cat /home/pi/CubeSatSim/sstv_image_2_320_x_256.jpg.wav | csdr convert_i16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + tx + "e3 > /dev/null 2>&1")
+								system("sudo pinfm  --audio /home/pi/CubeSatSim/sstv_image_2_320_x_256.jpg.wav --mode narrow --freq " + tx + "e6 > /dev/null 2>&1")	
 
 						output(txLed, 0)
 
@@ -1247,9 +1255,11 @@ if __name__ == "__main__":
 #							output (pd, 0)
 						else:	
 							if (debug_mode == 1):
-								system("cat /home/pi/CubeSatSim/camera_out.jpg.wav | csdr convert_i16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + tx + "e3")
-							else:
-								system("cat /home/pi/CubeSatSim/camera_out.jpg.wav | csdr convert_i16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + tx + "e3 > /dev/null 2>&1")
+	#							system("cat /home/pi/CubeSatSim/camera_out.jpg.wav | csdr convert_i16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + tx + "e3")
+								system("sudo pinfm  --audio /home/pi/CubeSatSim/camera_out.jpg.wav --mode narrow --freq " + tx + "e6")	
+				else:
+#								system("cat /home/pi/CubeSatSim/camera_out.jpg.wav | csdr convert_i16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + tx + "e3 > /dev/null 2>&1")
+								system("sudo pinfm  --audio /home/pi/CubeSatSim/camera_out.jpg.wav --mode narrow --freq " + tx + "e6 > /dev/null 2>&1")	
 
 						output(txLed, 0)
 #						output (ptt, 1)
@@ -1287,9 +1297,11 @@ if __name__ == "__main__":
 #							output (pd, 0)
 						else:	
 							if (debug_mode == 1):
-								system("cat /home/pi/CubeSatSim/sstv_image_1_320_x_256.jpg.wav | csdr convert_i16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + tx + "e3")
-							else:
-								system("cat /home/pi/CubeSatSim/sstv_image_1_320_x_256.jpg.wav | csdr convert_i16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + tx + "e3 > /dev/null 2>&1")
+#								system("cat /home/pi/CubeSatSim/sstv_image_1_320_x_256.jpg.wav | csdr convert_i16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + tx + "e3")
+								system("sudo pinfm  --audio /home/pi/CubeSatSim/sstv_image_1_320_x_256.jpg.wav  --mode narrow --freq " + tx + "e6")	
+				else:
+#								system("cat /home/pi/CubeSatSim/sstv_image_1_320_x_256.jpg.wav | csdr convert_i16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + tx + "e3 > /dev/null 2>&1")
+								system("sudo pinfm  --audio /home/pi/CubeSatSim/sstv_image_1_320_x_256.jpg.wav  --mode narrow --freq " + tx + "e6 > /dev/null 2>&1")	
 
 						output(txLed, 0)
 #						output (ptt, 1)
@@ -1324,9 +1336,11 @@ if __name__ == "__main__":
 #								output (pd, 0)
 							else:
 								if (debug_mode == 1):
-									system("cat /home/pi/CubeSatSim/sstv_image_2_320_x_256.jpg.wav | csdr convert_i16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + tx + "e3") 
-								else:
-									system("cat /home/pi/CubeSatSim/sstv_image_2_320_x_256.jpg.wav | csdr convert_i16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + tx + "e3 > /dev/null 2>&1")
+#									system("cat /home/pi/CubeSatSim/sstv_image_2_320_x_256.jpg.wav | csdr convert_i16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + tx + "e3") 
+									system("sudo pinfm  --audio /home/pi/CubeSatSim/stv_image_2_320_x_256.jpg.wav  --mode narrow --freq " + tx + "e6")	
+				else:
+#									system("cat /home/pi/CubeSatSim/sstv_image_2_320_x_256.jpg.wav | csdr convert_i16_f | csdr gain_ff 14000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + tx + "e3 > /dev/null 2>&1")
+									system("sudo pinfm  --audio /home/pi/CubeSatSim/stv_image_2_320_x_256.jpg.wav  --mode narrow --freq " + tx + "e6 > /dev/null 2>&1")	
 
 							output(txLed, 0)
 #							output (ptt, 1)
@@ -1336,7 +1350,9 @@ if __name__ == "__main__":
 					print("image 2 did not load - copy from CubeSatSim/sstv directory")
 					if (txc == False):
 						if (command_tx == True):
-							system("(while true; do (sleep 10 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + tx + "e3 &")
+	#						system("(while true; do (sleep 10 && cat /home/pi/CubeSatSim/wav/sstv.wav); done) | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + tx + "e3 &")
+							system("(while true; do (sleep 10 && sudo pinfm  --audio /home/pi/CubeSatSim/sstv.wav  --mode narrow --freq " + tx + "e6 &")
+
 					while 1:
 						if (command_tx == True):
 							if (doppler_mode):
@@ -1455,7 +1471,8 @@ if __name__ == "__main__":
 			output(ptt, 1)
 			
 			if (command_tx == True):
-				system("sudo nc -l 8080 | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + tx + "e3 &")
+#				system("sudo nc -l 8080 | csdr convert_i16_f | csdr gain_ff 7000 | csdr convert_f_samplerf 20833 | sudo rpitx-ui -i- -m RF -f " + tx + "e3 &")
+				system("sudo nc -l 8080 | sudo pinfm  --stdin  --mode narrow --freq " + tx + "e6 &")
 			print("Turning LED on/off and listening for carrier")
 			while 1:
 				output(txLed, 0)