Added WPM feature