Now saves charges/signatures