Charges calculation merged
Change in charges calculation