changes on the socket
merge