Major update on the UDP comm part