update udp from aymeric branch