Updated with new WS data