websocket update. Not complete but no battery left
merge