still messing with the WS