changed to udp server
merge