5 Commits (fix/socket)