Improved, almost working fine
Adding tcp