Reverted all WS Changes