I think this will fix the layer issue, and the websocket issue