updates from PR#79 feedback

Pricing model changes (Task #73569)