changed some stuff --> because of websocket