add websocket support & circles