Added back TCP mode