Final Changes in charges calculation