custom modifications for GPG project