UDP: first command working
merge conflict solved