9 Commits (fix/socket)