Improved the Tcp event