Updated controller and sockets on client and server