Improve DigitalWNIP