Updated for gpg purposes