- improve WSD code