Small refactor
Socket integrated
Integerated socket
merged with master