improve WClient