a few changes on websocket