Folded in websocket bit; aligned with other changed to nog.