diff --git a/main_test.go b/main_test.go
index d2e0e6d83c729366797bb3a2f3904f357bf84019..33cdc52226a616a77e15cb4dc1f52db769b28f54 100644
--- a/main_test.go
+++ b/main_test.go
@@ -74,7 +74,7 @@ func emulatedKMS(myName string, myUDPAddr string, peerUDPAddr string) {
 		return
 	}
 
-	myQL.QuantumElementLink.AddPeer(*udpQL2Addr)
+	myQL.QuantumElementLink.AddPeer(udpQL2Addr)
 
 	// Start the SDN/management and key retrieval interface
 	go kms.StartETSI(peerUDPAddr, emuKMS)
diff --git a/quantumlayer/quantumlayer-emu-prng.go b/quantumlayer/quantumlayer-emu-prng.go
index 169b5ecc6f599d271228140e73415eb33f747c0c..7b437dc0566fc792ff28fb58082bed4b534a3850 100644
--- a/quantumlayer/quantumlayer-emu-prng.go
+++ b/quantumlayer/quantumlayer-emu-prng.go
@@ -150,7 +150,7 @@ func (qlemuprng *QuantumlayerEmuPRNG) PowerOff() {
 	log.Println("QuantumlayerEmuPRNG is powered off...discharging.")
 }
 
-func (qlemuprng *QuantumlayerEmuPRNG) AddPeer(addr net.UDPAddr) {
+func (qlemuprng *QuantumlayerEmuPRNG) AddPeer(addr *net.UDPAddr) {
 	if qlemuprng.poweron == false {
 		return
 	}
@@ -184,7 +184,7 @@ func (qlemuprng *QuantumlayerEmuPRNG) AddPeer(addr net.UDPAddr) {
 						log.Printf("json.Marshal error %s", err)
 					}
 
-					_, _, err = qlemuprng.udpSrvConn.WriteMsgUDPAddrPort(jsonPayload, nil, addr.AddrPort())
+					_, _, err = qlemuprng.udpSrvConn.WriteMsgUDP(jsonPayload, nil, addr)
 					if err != nil {
 						log.Fatalf("WriteMsgUDPAddrPort failed: %s", err)
 					}
diff --git a/quantumlayer/quantumlayer-emu-prng_test.go b/quantumlayer/quantumlayer-emu-prng_test.go
index 69d30b582e35da3b1ebd99fca9a1ba38eb78a3a4..502377abd7c2564449749ebe78f38bbe611ceba7 100644
--- a/quantumlayer/quantumlayer-emu-prng_test.go
+++ b/quantumlayer/quantumlayer-emu-prng_test.go
@@ -35,8 +35,8 @@ func TestQuantumLayer(t *testing.T) {
 		return
 	}
 
-	ql1.AddPeer(*udpQL2Addr)
-	ql2.AddPeer(*udpQL1Addr)
+	ql1.AddPeer(udpQL2Addr)
+	ql2.AddPeer(udpQL1Addr)
 
 	for n := 0; n < 2; n++ {
 		resultQl1, err := ql1.GetKeyBatchPeer()
@@ -59,5 +59,4 @@ func TestQuantumLayer(t *testing.T) {
 		time.Sleep(5 * time.Second)
 
 	}
-
 }