improve calculations

Pricing model changes (Task #73569)