Move to forever for WS as well