Updated for gpg