Completed conversion to TCP