Updated with WPM formula