Readded UDP back
No warnings in Linux(g++ & clang++) with valgrind