Change to using TCP server