updated to latest Ws changes