Refactored UDP