token and websocket changes