Switch to using websockets