Somewhat working version.
Fix UDP version.
Minor change.