Update with new EHP formula: WIP