Improve WSD code
- work on WSD code