Updated with PGP mate