[master] Switching Gears to UDP