viz sockets
fixed merge conflicts