Refactored Charges