diff --git a/encoding_test.go b/encoding_test.go
index 1bb9a1c..9e0e945 100644
--- a/encoding_test.go
+++ b/encoding_test.go
@@ -118,6 +118,6 @@ func TestPartialDecryptionZKPBSONification(t *testing.T) {
 }
 
 func TestThresholdKeyBSON(t *testing.T) {
-	key := &ThresholdKey{PublicKey{b(9), b(8)}, 7, 6, b(3), []*big.Int{b(2), b(34)}}
+	key := &ThresholdKey{PublicKey{b(9)}, 7, 6, b(3), []*big.Int{b(2), b(34)}, b(8)}
 	AssertBSONIsGood(key, new(ThresholdKey), t)
 }
diff --git a/paillier.go b/paillier.go
index df22c7d..74dbd8d 100644
--- a/paillier.go
+++ b/paillier.go
@@ -7,12 +7,11 @@ import (
 )
 
 type PublicKey struct {
-	N, G *big.Int // usually G is set to N+1
+	N *big.Int // usually G is set to N+1
 }
 
 func (this *PublicKey) GetBSON() (interface{}, error) {
 	m := make(map[string]string)
-	m["g"] = fmt.Sprintf("%x", this.G)
 	m["n"] = fmt.Sprintf("%x", this.N)
 	return m, nil
 }
@@ -57,8 +56,7 @@ type PrivateKey struct {
 }
 
 func (this *PrivateKey) String() string {
-	ret := fmt.Sprintf("g     :  %x", this.G)
-	ret += fmt.Sprintf("n     :  %x", this.N)
+	ret := fmt.Sprintf("n     :  %x", this.N)
 	ret += fmt.Sprintf("lambda:  %x", this.Lambda)
 	return ret
 }
diff --git a/thresholdkey.go b/thresholdkey.go
index 30b966d..c76bb6c 100644
--- a/thresholdkey.go
+++ b/thresholdkey.go
@@ -14,6 +14,7 @@ type ThresholdKey struct {
 	Threshold                      int
 	V                              *big.Int
 	Vi                             []*big.Int
+	G                              *big.Int
 }
 
 // returns the value of (4*delta**2)** -1  mod n