Modified interface and implementation for the tcp.