upgrade to ws upstream