Changes in charges calculation