websocket update - not done yet
websocket update - not done yet - fixed conflict