updated websockets and separated data