Updated sockets, not fully working