Add these changes to /wip/socket