UDP modifications