Implemented socket
Merge