socket appearences modified
merge conflict fix