Some changes for ui and tcp.