Fixed connection and protocol
improved