EchoServer second commit