diff --git a/basice2e/gateway-1.yaml b/basice2e/gateway-1.yaml
index f8778598a453aad41cd3ce575ace4c1d68fdbcb9..e04a6fd8b432866570d10182352f1460d1b46abc 100644
--- a/basice2e/gateway-1.yaml
+++ b/basice2e/gateway-1.yaml
@@ -19,6 +19,7 @@ cMixNodes:
   - "127.0.0.1:50003"
   - "127.0.0.1:50004"
   - "127.0.0.1:50005"
+  - "127.0.0.1:50006"
 
 # The listening address of this gateway
 Port: 8440
@@ -36,7 +37,10 @@ certPath: "../keys/cmix.rip.crt"
 permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
 serverCertPath: "../keys/cmix.rip.crt"
-IP_Whitelist_File: whitelist.txt
+
+# Needed to verify that NDF originated from permissioning
+# Path to the permissioning certificate file
+permissioningCertPath: "../keys/cmix.rip.crt"
 
 ### Anything below this line is to be deprecated ###
 
@@ -45,5 +49,6 @@ groups:
     prime: "F6FAC7E480EE519354C058BF856AEBDC43AD60141BAD5573910476D030A869979A7E23F5FC006B6CE1B1D7CDA849BDE46A145F80EE97C21AA2154FA3A5CF25C75E225C6F3384D3C0C6BEF5061B87E8D583BEFDF790ECD351F6D2B645E26904DE3F8A9861CC3EAD0AA40BD7C09C1F5F655A9E7BA7986B92B73FD9A6A69F54EFC92AC7E21D15C9B85A76084D1EEFBC4781B91E231E9CE5F007BC75A8656CBD98E282671C08A5400C4E4D039DE5FD63AA89A618C5668256B12672C66082F0348B6204DD0ADE58532C967D055A5D2C34C43DF9998820B5DFC4C49C6820191CB3EC81062AA51E23CEEA9A37AB523B24C0E93B440FDC17A50B219AB0D373014C25EE8F"
     smallprime: "D6B35AA395D9287A5530C474D776EA2FCF5B815E89C9DB4C7BB7A9EFB8F3F34B"
     generator: "B22FDF91EE6BA01BDE4969C1A986EA1F81C4A1795921403F3437D681D05E95167C2F6414CCB74AC8D6B3BA8C0E85C7E4DEB0E8B5256D37BC5C21C8BE068F5342858AFF2FC7FF2644EBED8B10271941C74C86CCD71AA6D2D98E4C8C70875044900F842998037A7DFB9BC63BAF1BC2800E73AF9615E4F5B869D4C6DE6E5F48FACE9CA594CC5D228CB7F763A0AD6BF6ED78B27F902D9ADA38A1FCD7D09E398CE377BB15A459044D3B8541DC6D8049B66AE1662682254E69FAD31CA0016251D0522EF8FE587A3F6E3AB1E5F9D8C2998874ABAB205217E95B234A7D3E69713B884918ADB57360B5DE97336C7DC2EB8A3FEFB0C4290E7A92FF5758529AC45273135427"
+IP_Whitelist_File: whitelist.txt
 
 # === END YAML
diff --git a/basice2e/gateway-2.yaml b/basice2e/gateway-2.yaml
index 2e587577f6cfa3ac1e84121f8c96a15b9f220e68..c87a33b449b3cefb62c7e57c6da796ddb2888c8e 100644
--- a/basice2e/gateway-2.yaml
+++ b/basice2e/gateway-2.yaml
@@ -37,7 +37,10 @@ certPath: "../keys/cmix.rip.crt"
 permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
 serverCertPath: "../keys/cmix.rip.crt"
-IP_Whitelist_File: whitelist.txt
+
+# Needed to verify that NDF originated from permissioning
+# Path to the permissioning certificate file
+permissioningCertPath: "../keys/cmix.rip.crt"
 
 ### Anything below this line is to be deprecated ###
 
@@ -47,4 +50,7 @@ groups:
     smallprime: "D6B35AA395D9287A5530C474D776EA2FCF5B815E89C9DB4C7BB7A9EFB8F3F34B"
     generator: "B22FDF91EE6BA01BDE4969C1A986EA1F81C4A1795921403F3437D681D05E95167C2F6414CCB74AC8D6B3BA8C0E85C7E4DEB0E8B5256D37BC5C21C8BE068F5342858AFF2FC7FF2644EBED8B10271941C74C86CCD71AA6D2D98E4C8C70875044900F842998037A7DFB9BC63BAF1BC2800E73AF9615E4F5B869D4C6DE6E5F48FACE9CA594CC5D228CB7F763A0AD6BF6ED78B27F902D9ADA38A1FCD7D09E398CE377BB15A459044D3B8541DC6D8049B66AE1662682254E69FAD31CA0016251D0522EF8FE587A3F6E3AB1E5F9D8C2998874ABAB205217E95B234A7D3E69713B884918ADB57360B5DE97336C7DC2EB8A3FEFB0C4290E7A92FF5758529AC45273135427"
 
+IP_Whitelist_File: whitelist.txt
+
+
 # === END YAML
diff --git a/basice2e/gateway-3.yaml b/basice2e/gateway-3.yaml
index 9e2c498930a3c02605ae6c1e5d8e91029b5a8836..14eed4dd2b8e526572563cc11b8be39a69c0676e 100644
--- a/basice2e/gateway-3.yaml
+++ b/basice2e/gateway-3.yaml
@@ -37,7 +37,10 @@ certPath: "../keys/cmix.rip.crt"
 permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
 serverCertPath: "../keys/cmix.rip.crt"
-IP_Whitelist_File: whitelist.txt
+
+# Needed to verify that NDF originated from permissioning
+# Path to the permissioning certificate file
+permissioningCertPath: "../keys/cmix.rip.crt"
 
 ### Anything below this line is to be deprecated ###
 
@@ -47,4 +50,6 @@ groups:
     smallprime: "D6B35AA395D9287A5530C474D776EA2FCF5B815E89C9DB4C7BB7A9EFB8F3F34B"
     generator: "B22FDF91EE6BA01BDE4969C1A986EA1F81C4A1795921403F3437D681D05E95167C2F6414CCB74AC8D6B3BA8C0E85C7E4DEB0E8B5256D37BC5C21C8BE068F5342858AFF2FC7FF2644EBED8B10271941C74C86CCD71AA6D2D98E4C8C70875044900F842998037A7DFB9BC63BAF1BC2800E73AF9615E4F5B869D4C6DE6E5F48FACE9CA594CC5D228CB7F763A0AD6BF6ED78B27F902D9ADA38A1FCD7D09E398CE377BB15A459044D3B8541DC6D8049B66AE1662682254E69FAD31CA0016251D0522EF8FE587A3F6E3AB1E5F9D8C2998874ABAB205217E95B234A7D3E69713B884918ADB57360B5DE97336C7DC2EB8A3FEFB0C4290E7A92FF5758529AC45273135427"
 
+IP_Whitelist_File: whitelist.txt
+
 # === END YAML
diff --git a/basice2e/gateway-4.yaml b/basice2e/gateway-4.yaml
index f0d08147a29512da58bd2b396ac89547d4f279da..f722f0814309cb79f7aae7b322ad80f604e1f9b9 100644
--- a/basice2e/gateway-4.yaml
+++ b/basice2e/gateway-4.yaml
@@ -36,7 +36,10 @@ certPath: "../keys/cmix.rip.crt"
 permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
 serverCertPath: "../keys/cmix.rip.crt"
-IP_Whitelist_File: whitelist.txt
+
+# Needed to verify that NDF originated from permissioning
+# Path to the permissioning certificate file
+permissioningCertPath: "../keys/cmix.rip.crt"
 
 ### Anything below this line is to be deprecated ###
 
@@ -45,5 +48,6 @@ groups:
     prime: "F6FAC7E480EE519354C058BF856AEBDC43AD60141BAD5573910476D030A869979A7E23F5FC006B6CE1B1D7CDA849BDE46A145F80EE97C21AA2154FA3A5CF25C75E225C6F3384D3C0C6BEF5061B87E8D583BEFDF790ECD351F6D2B645E26904DE3F8A9861CC3EAD0AA40BD7C09C1F5F655A9E7BA7986B92B73FD9A6A69F54EFC92AC7E21D15C9B85A76084D1EEFBC4781B91E231E9CE5F007BC75A8656CBD98E282671C08A5400C4E4D039DE5FD63AA89A618C5668256B12672C66082F0348B6204DD0ADE58532C967D055A5D2C34C43DF9998820B5DFC4C49C6820191CB3EC81062AA51E23CEEA9A37AB523B24C0E93B440FDC17A50B219AB0D373014C25EE8F"
     smallprime: "D6B35AA395D9287A5530C474D776EA2FCF5B815E89C9DB4C7BB7A9EFB8F3F34B"
     generator: "B22FDF91EE6BA01BDE4969C1A986EA1F81C4A1795921403F3437D681D05E95167C2F6414CCB74AC8D6B3BA8C0E85C7E4DEB0E8B5256D37BC5C21C8BE068F5342858AFF2FC7FF2644EBED8B10271941C74C86CCD71AA6D2D98E4C8C70875044900F842998037A7DFB9BC63BAF1BC2800E73AF9615E4F5B869D4C6DE6E5F48FACE9CA594CC5D228CB7F763A0AD6BF6ED78B27F902D9ADA38A1FCD7D09E398CE377BB15A459044D3B8541DC6D8049B66AE1662682254E69FAD31CA0016251D0522EF8FE587A3F6E3AB1E5F9D8C2998874ABAB205217E95B234A7D3E69713B884918ADB57360B5DE97336C7DC2EB8A3FEFB0C4290E7A92FF5758529AC45273135427"
+IP_Whitelist_File: whitelist.txt
 
 # === END YAML
diff --git a/basice2e/gateway-5.yaml b/basice2e/gateway-5.yaml
index bf220794f77c516653e06c48d0d60c52030f3b4b..b33fd86d99e81b264e6ef05fba2b0172d37300db 100644
--- a/basice2e/gateway-5.yaml
+++ b/basice2e/gateway-5.yaml
@@ -36,7 +36,10 @@ certPath: "../keys/cmix.rip.crt"
 permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
 serverCertPath: "../keys/cmix.rip.crt"
-IP_Whitelist_File: whitelist.txt
+
+# Needed to verify that NDF originated from permissioning
+# Path to the permissioning certificate file
+permissioningCertPath: "../keys/cmix.rip.crt"
 
 ### Anything below this line is to be deprecated ###
 
@@ -45,5 +48,6 @@ groups:
     prime: "F6FAC7E480EE519354C058BF856AEBDC43AD60141BAD5573910476D030A869979A7E23F5FC006B6CE1B1D7CDA849BDE46A145F80EE97C21AA2154FA3A5CF25C75E225C6F3384D3C0C6BEF5061B87E8D583BEFDF790ECD351F6D2B645E26904DE3F8A9861CC3EAD0AA40BD7C09C1F5F655A9E7BA7986B92B73FD9A6A69F54EFC92AC7E21D15C9B85A76084D1EEFBC4781B91E231E9CE5F007BC75A8656CBD98E282671C08A5400C4E4D039DE5FD63AA89A618C5668256B12672C66082F0348B6204DD0ADE58532C967D055A5D2C34C43DF9998820B5DFC4C49C6820191CB3EC81062AA51E23CEEA9A37AB523B24C0E93B440FDC17A50B219AB0D373014C25EE8F"
     smallprime: "D6B35AA395D9287A5530C474D776EA2FCF5B815E89C9DB4C7BB7A9EFB8F3F34B"
     generator: "B22FDF91EE6BA01BDE4969C1A986EA1F81C4A1795921403F3437D681D05E95167C2F6414CCB74AC8D6B3BA8C0E85C7E4DEB0E8B5256D37BC5C21C8BE068F5342858AFF2FC7FF2644EBED8B10271941C74C86CCD71AA6D2D98E4C8C70875044900F842998037A7DFB9BC63BAF1BC2800E73AF9615E4F5B869D4C6DE6E5F48FACE9CA594CC5D228CB7F763A0AD6BF6ED78B27F902D9ADA38A1FCD7D09E398CE377BB15A459044D3B8541DC6D8049B66AE1662682254E69FAD31CA0016251D0522EF8FE587A3F6E3AB1E5F9D8C2998874ABAB205217E95B234A7D3E69713B884918ADB57360B5DE97336C7DC2EB8A3FEFB0C4290E7A92FF5758529AC45273135427"
+IP_Whitelist_File: whitelist.txt
 
 # === END YAML
diff --git a/basice2e/gateway-6.yaml b/basice2e/gateway-6.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..4d7b80e52de6dbae485983e343c12e044e72a5b2
--- /dev/null
+++ b/basice2e/gateway-6.yaml
@@ -0,0 +1,51 @@
+# START YAML ===
+################################################################################
+## Copyright © 2019 Privategrity Corporation                                   #
+##                                                                             #
+## All rights reserved.                                                        #
+################################################################################
+
+# Output log file
+log: "results/gateways/gatway-5.log"
+
+# Log message level
+logLevel: 1
+
+# The cMix nodes in the network
+cMixNodes:
+  - "127.0.0.1:50000"
+  - "127.0.0.1:50001"
+  - "127.0.0.1:50002"
+  - "127.0.0.1:50003"
+  - "127.0.0.1:50004"
+  - "127.0.0.1:50005"
+
+# The listening address of this gateway
+Port: 8445
+
+# The number of seconds a message should remain in the globals before being
+# deleted from the user's message queue
+MessageTimeout: 1800
+
+# === REQUIRED FOR ENABLING TLS ===
+# Path to the private key file
+keyPath: "../keys/cmix.rip.key"
+# Path to the certificate file
+certPath: "../keys/cmix.rip.crt"
+# Path to the certificate file
+serverCertPath: "../keys/cmix.rip.crt"
+
+# Needed to verify that NDF originated from permissioning
+# Path to the permissioning certificate file
+permissioningCertPath: "../keys/cmix.rip.crt"
+
+### Anything below this line is to be deprecated ###
+
+groups:
+  cmix:
+    prime: "F6FAC7E480EE519354C058BF856AEBDC43AD60141BAD5573910476D030A869979A7E23F5FC006B6CE1B1D7CDA849BDE46A145F80EE97C21AA2154FA3A5CF25C75E225C6F3384D3C0C6BEF5061B87E8D583BEFDF790ECD351F6D2B645E26904DE3F8A9861CC3EAD0AA40BD7C09C1F5F655A9E7BA7986B92B73FD9A6A69F54EFC92AC7E21D15C9B85A76084D1EEFBC4781B91E231E9CE5F007BC75A8656CBD98E282671C08A5400C4E4D039DE5FD63AA89A618C5668256B12672C66082F0348B6204DD0ADE58532C967D055A5D2C34C43DF9998820B5DFC4C49C6820191CB3EC81062AA51E23CEEA9A37AB523B24C0E93B440FDC17A50B219AB0D373014C25EE8F"
+    smallprime: "D6B35AA395D9287A5530C474D776EA2FCF5B815E89C9DB4C7BB7A9EFB8F3F34B"
+    generator: "B22FDF91EE6BA01BDE4969C1A986EA1F81C4A1795921403F3437D681D05E95167C2F6414CCB74AC8D6B3BA8C0E85C7E4DEB0E8B5256D37BC5C21C8BE068F5342858AFF2FC7FF2644EBED8B10271941C74C86CCD71AA6D2D98E4C8C70875044900F842998037A7DFB9BC63BAF1BC2800E73AF9615E4F5B869D4C6DE6E5F48FACE9CA594CC5D228CB7F763A0AD6BF6ED78B27F902D9ADA38A1FCD7D09E398CE377BB15A459044D3B8541DC6D8049B66AE1662682254E69FAD31CA0016251D0522EF8FE587A3F6E3AB1E5F9D8C2998874ABAB205217E95B234A7D3E69713B884918ADB57360B5DE97336C7DC2EB8A3FEFB0C4290E7A92FF5758529AC45273135427"
+IP_Whitelist_File: whitelist.txt
+
+# === END YAML
diff --git a/basice2e/nodeID-6.json b/basice2e/nodeID-6.json
new file mode 100644
index 0000000000000000000000000000000000000000..1d73bf12f1e1c5891e6047b5b48805e921ae662a
--- /dev/null
+++ b/basice2e/nodeID-6.json
@@ -0,0 +1 @@
+{"salt":[225,144,91,180,18,14,23,240,200,174,125,232,115,81,237,122,21,20,1,139,253,147,120,75,21,227,21,30,72,26,180,192],"id":[50,9,149,156,90,11,87,99,98,45,160,244,82,41,63,193,175,177,201,228,32,160,225,83,39,217,170,40,206,157,190,37,2],"type":"node"}
\ No newline at end of file
diff --git a/basice2e/permissioning.yaml b/basice2e/permissioning.yaml
index 69dd767971501b14ec4ddca972e2aa1662cd7daa..c627ceab38708104ab031795e6ec0df8a4797944 100644
--- a/basice2e/permissioning.yaml
+++ b/basice2e/permissioning.yaml
@@ -17,9 +17,9 @@ port: 18000
 dbUsername: ""
 dbPassword: ""
 dbName: ""
-dbAddress: ""
+dbAddress: "0.0.0.0:6969"
 
-minimumNodes: 5
+minimumNodes: 6
 
 clientRegCodes:
   - "FFFF"
@@ -43,6 +43,9 @@ serverCertPath: "../keys/cmix.rip.crt"
 
 udbID: 3
 
+# Time interval (in minutes) in which the database is
+# checked for banned nodes
+BanTrackerInterval: "3"
 
 groups:
   cmix:
diff --git a/basice2e/regCodes.json b/basice2e/regCodes.json
index e491b421986134e50cae3449f25442508dacf9eb..f0f63410b57c9ae070c9377175a98d40d89180fb 100644
--- a/basice2e/regCodes.json
+++ b/basice2e/regCodes.json
@@ -1 +1 @@
-[{"RegCode": "qpol", "Order": "0"},{"RegCode": "yiiq", "Order": "1"},{"RegCode": "vydz", "Order": "2"},{"RegCode": "gwxs", "Order": "3"},{"RegCode": "nahv", "Order": "4"}]
+[{"RegCode": "qpol", "Order": "0"},{"RegCode": "yiiq", "Order": "1"},{"RegCode": "vydz", "Order": "2"},{"RegCode": "gwxs", "Order": "3"},{"RegCode": "nahv", "Order": "4"}, {"RegCode": "doko", "Order": "5"}]
diff --git a/basice2e/registration.json b/basice2e/registration.json
index 22c395c168e8c4be9868d1c55f4bd0165fae9ef0..1d0cbe56993000cd8e901495c6f7a5d12b3e492b 100644
--- a/basice2e/registration.json
+++ b/basice2e/registration.json
@@ -1,6 +1,11 @@
 {
-    "TeamSize": 5,
-    "BatchSize": 4,
-    "RandomOrdering": false,
-    "MinimumDelay": 300
+  "TeamSize": 3,
+  "BatchSize": 32,
+  "RandomOrdering": false,
+  "MinimumDelay": 60,
+  "RealtimeDelay": 120,
+  "Threshold":     3,
+  "NodeCleanUpInterval": 3,
+  "Secure": 		     true
+
  }
diff --git a/basice2e/rid.txt b/basice2e/rid.txt
new file mode 100644
index 0000000000000000000000000000000000000000..31171ea663d721a04fe26b66ecb8eeafb9940284
--- /dev/null
+++ b/basice2e/rid.txt
@@ -0,0 +1 @@
+INFO 2020/05/21 09:57:29 [BSnVrOIc4475103sfpu9CwsmB3rOqCIYgracZM5s0RcC:50004]: RID 0 ReceiveFinishRealtime END
diff --git a/basice2e/run.sh b/basice2e/run.sh
index c7157effe08bc386f39469f4894436aaf9c69b30..642711bb82c0eb58ca7d35691b831dcacb99ab8b 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -41,7 +41,7 @@ $PERMCMD > $SERVERLOGS/permissioning-console.txt 2>&1 &
 PIDVAL=$!
 echo "$PERMCMD -- $PIDVAL"
 
-for SERVERID in $(seq 5 -1 1)
+for SERVERID in $(seq 6 -1 1)
 do
     IDX=$(($SERVERID - 1))
     SERVERCMD="../bin/server -i $IDX --roundBufferTimeout 300s --config server-$SERVERID.yaml"
@@ -51,7 +51,7 @@ do
 done
 
 # Start gateways
-for GWID in $(seq 5 -1 1)
+for GWID in $(seq 6 -1 1)
 do
     IDX=$(($GWID - 1))
     GATEWAYCMD="../bin/gateway  -i $IDX  --config gateway-$GWID.yaml"
diff --git a/basice2e/server-1.yaml b/basice2e/server-1.yaml
index c5fd5f8556b83d1c324f46723b1a8c04615437b7..280ae93b7784b8a4697f161fcdc497367e999c37 100644
--- a/basice2e/server-1.yaml
+++ b/basice2e/server-1.yaml
@@ -17,30 +17,34 @@ node:
         key:  "../keys/cmix.rip.key"
         log:  "results/servers/server-1.log"
     addresses:
-        - "127.0.0.1:50000"
-        - "127.0.0.1:50001"
-        - "127.0.0.1:50002"
-        - "127.0.0.1:50003"
-        - "127.0.0.1:50004"
+      - "127.0.0.1:50000"
+      - "127.0.0.1:50001"
+      - "127.0.0.1:50002"
+      - "127.0.0.1:50003"
+      - "127.0.0.1:50004"
+      - "127.0.0.1:50005"
+      - "127.0.0.1:50006"
 database:
-    name: "node1"
-    username: "cmix_server"
-    password: ""
-    addresses:
-        - ""
-        - ""
-        - ""
-        - ""
-        - ""
+  name: "node5"
+  username: "cmix_server"
+  password: ""
+  addresses:
+    - ""
+    - ""
+    - ""
+    - ""
+    - ""
+    - ""
 gateways:
-    paths:
-        cert: "../keys/cmix.rip.crt"
-    addresses:
-        - "127.0.0.1:8440"
-        - "127.0.0.1:8441"
-        - "127.0.0.1:8442"
-        - "127.0.0.1:8443"
-        - "127.0.0.1:8444"
+  paths:
+    cert: "../keys/cmix.rip.crt"
+  addresses:
+    - "127.0.0.1:8440"
+    - "127.0.0.1:8441"
+    - "127.0.0.1:8442"
+    - "127.0.0.1:8443"
+    - "127.0.0.1:8444"
+    - "127.0.0.1:8445"
 permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"
diff --git a/basice2e/server-2.yaml b/basice2e/server-2.yaml
index 2b74ef9e091dd1304dcf2f6f77f78b08326f5dca..4c0e8091141b240925e52c555f1f16db6d49caa2 100644
--- a/basice2e/server-2.yaml
+++ b/basice2e/server-2.yaml
@@ -23,25 +23,28 @@ node:
       - "127.0.0.1:50003"
       - "127.0.0.1:50004"
       - "127.0.0.1:50005"
+      - "127.0.0.1:50006"
 database:
-    name: "node2"
-    username: "cmix_server"
-    password: ""
-    addresses:
-        - ""
-        - ""
-        - ""
-        - ""
-        - ""
+  name: "node5"
+  username: "cmix_server"
+  password: ""
+  addresses:
+    - ""
+    - ""
+    - ""
+    - ""
+    - ""
+    - ""
 gateways:
-    paths:
-        cert: "../keys/cmix.rip.crt"
-    addresses:
-        - "127.0.0.1:8440"
-        - "127.0.0.1:8441"
-        - "127.0.0.1:8442"
-        - "127.0.0.1:8443"
-        - "127.0.0.1:8444"
+  paths:
+    cert: "../keys/cmix.rip.crt"
+  addresses:
+    - "127.0.0.1:8440"
+    - "127.0.0.1:8441"
+    - "127.0.0.1:8442"
+    - "127.0.0.1:8443"
+    - "127.0.0.1:8444"
+    - "127.0.0.1:8445"
 permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"
diff --git a/basice2e/server-3.yaml b/basice2e/server-3.yaml
index 7aa772c6e59cfb5efe5b7b5a92ebdf93c1e6c735..e5561edb8216df6db3b528249a059dfa59a97a53 100644
--- a/basice2e/server-3.yaml
+++ b/basice2e/server-3.yaml
@@ -23,25 +23,28 @@ node:
       - "127.0.0.1:50003"
       - "127.0.0.1:50004"
       - "127.0.0.1:50005"
+      - "127.0.0.1:50006"
 database:
-    name: "node3"
-    username: "cmix_server"
-    password: ""
-    addresses:
-        - ""
-        - ""
-        - ""
-        - ""
-        - ""
+  name: "node5"
+  username: "cmix_server"
+  password: ""
+  addresses:
+    - ""
+    - ""
+    - ""
+    - ""
+    - ""
+    - ""
 gateways:
-    paths:
-        cert: "../keys/cmix.rip.crt"
-    addresses:
-        - "127.0.0.1:8440"
-        - "127.0.0.1:8441"
-        - "127.0.0.1:8442"
-        - "127.0.0.1:8443"
-        - "127.0.0.1:8444"
+  paths:
+    cert: "../keys/cmix.rip.crt"
+  addresses:
+    - "127.0.0.1:8440"
+    - "127.0.0.1:8441"
+    - "127.0.0.1:8442"
+    - "127.0.0.1:8443"
+    - "127.0.0.1:8444"
+    - "127.0.0.1:8445"
 permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"
diff --git a/basice2e/server-4.yaml b/basice2e/server-4.yaml
index 9af44006fb723d1f13f98d6cf540aaadf2ff49fb..d603065b2e6bd0b2d61d779f548a95f90f74bbda 100644
--- a/basice2e/server-4.yaml
+++ b/basice2e/server-4.yaml
@@ -23,25 +23,28 @@ node:
       - "127.0.0.1:50003"
       - "127.0.0.1:50004"
       - "127.0.0.1:50005"
+      - "127.0.0.1:50006"
 database:
-    name: "node4"
-    username: "cmix_server"
-    password: ""
-    addresses:
-        - ""
-        - ""
-        - ""
-        - ""
-        - ""
+  name: "node5"
+  username: "cmix_server"
+  password: ""
+  addresses:
+    - ""
+    - ""
+    - ""
+    - ""
+    - ""
+    - ""
 gateways:
-    paths:
-        cert: "../keys/cmix.rip.crt"
-    addresses:
-        - "127.0.0.1:8440"
-        - "127.0.0.1:8441"
-        - "127.0.0.1:8442"
-        - "127.0.0.1:8443"
-        - "127.0.0.1:8444"
+  paths:
+    cert: "../keys/cmix.rip.crt"
+  addresses:
+    - "127.0.0.1:8440"
+    - "127.0.0.1:8441"
+    - "127.0.0.1:8442"
+    - "127.0.0.1:8443"
+    - "127.0.0.1:8444"
+    - "127.0.0.1:8445"
 permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"
diff --git a/basice2e/server-5.yaml b/basice2e/server-5.yaml
index 2f7f8ea62ff93f88a45a7a92f8128e5f3591de27..af4bb5b4a43a80cb6f186aeb577a183d42569faa 100644
--- a/basice2e/server-5.yaml
+++ b/basice2e/server-5.yaml
@@ -23,6 +23,7 @@ node:
       - "127.0.0.1:50003"
       - "127.0.0.1:50004"
       - "127.0.0.1:50005"
+      - "127.0.0.1:50006"
 database:
     name: "node5"
     username: "cmix_server"
@@ -33,6 +34,7 @@ database:
         - ""
         - ""
         - ""
+        - ""
 gateways:
     paths:
         cert: "../keys/cmix.rip.crt"
@@ -42,6 +44,7 @@ gateways:
         - "127.0.0.1:8442"
         - "127.0.0.1:8443"
         - "127.0.0.1:8444"
+        - "127.0.0.1:8445"
 permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"
diff --git a/basice2e/server-6.yaml b/basice2e/server-6.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7ed4aa61d8bfefff695b870e02333f1712b2b207
--- /dev/null
+++ b/basice2e/server-6.yaml
@@ -0,0 +1,63 @@
+# START YAML ===
+################################################################################
+## Copyright © 2019 Privategrity Corporation                                   #
+##                                                                             #
+## All rights reserved.                                                        #
+################################################################################
+skipReg: true
+# Log message level
+logLevel: 1
+
+useGpu: false
+
+node:
+  id: ""
+  paths:
+    idf:  "nodeID-6.json"
+    cert: "../keys/cmix.rip.crt"
+    key:  "../keys/cmix.rip.key"
+    log:  "results/servers/server-6.log"
+  addresses:
+    - "127.0.0.1:50000"
+    - "127.0.0.1:50001"
+    - "127.0.0.1:50002"
+    - "127.0.0.1:50003"
+    - "127.0.0.1:50004"
+    - "127.0.0.1:50005"
+database:
+  name: "node6"
+  username: "cmix_server"
+  password: ""
+  addresses:
+    - ""
+    - ""
+    - ""
+    - ""
+    - ""
+    - ""
+gateways:
+  paths:
+    cert: "../keys/cmix.rip.crt"
+  addresses:
+    - "127.0.0.1:8440"
+    - "127.0.0.1:8441"
+    - "127.0.0.1:8442"
+    - "127.0.0.1:8443"
+    - "127.0.0.1:8444"
+    - "127.0.0.1:8445"
+permissioning:
+  paths:
+    cert: "../keys/cmix.rip.crt"
+  address: "127.0.0.1:18000"
+  registrationCode: "doko"
+  publicKey: "-----BEGIN PUBLIC KEY-----\nMIIDNTCCAiwCggEBAJ22+1lRtmu2/h4UDx0s5VAjdBYf1lON8WSCGGQvC1xIyPek\nGq36GHMkuHZ0+hgisA8ez4E2lD18VXVyZOWhpE/+AS6ZNuAMHT6TELAcfReYBdMF\niyqfS7b5cWv+YRfGtbPMTZvjQRBK1KgK1slOAF9LmT4U8JHrUXQ78zBQw43iNVZ+\nGzTD1qXAzqoaDzaCE8PRmEPQtLCdy5/HLTnI3kHxvxTUu0Vjyig3FiHK0zJLai05\nIUW+v6x0iAUjb1yi/pK4cc2PnDbTKStVCcqMqneirfx7/XfdpvcRJadFb+oVPkMy\nVqImHGoG7TaTeX55lfrVqrvPvj7aJ0HjdUBK4lsCIQDywxGTdM52yTVpkLRlN0oX\n8j+e01CJvZafYcbd6ZmMHwKCAQBcf/awb48UP+gohDNJPkdpxNmIrOW+JaDiSAln\nBxbGE9ewzuaTL4+qfETSyyRSPaU/vk9uw1lYktGqWMQyigbEahVmLn6qcDod7Pi7\nstBdvi65VsFCozhmHRBGHA0TVHIIUFfzSUMJ/6c8YR94syrbtXQMNhyfNb6QmX2y\nAU4u9apheC9Sq+uL1kMsTdCXvFQjsoXa+2DcNk6BYfSio1rKOhCxxNIDzHakcKM6\n/cvdkpWYWavYtW4XJSUteOrGbnG6muPx3SSHGZh0OTzU2DIYaABlR2Dh40wJ5NFV\nF5+ewNxEc/mWvc5u7Ryr7YtvEW962c9QXfD5mONKsnUUsP/nAoIBAQCTyv8fEcAA\nD0B3f5owQ9YTkIelBuTfRYSSTlprDw7cvvAtB72N+Mqv7v+eHgwZgp8litEn/l2n\nr8eI1UODFgBiOXq7INgKjDSu1zM4FcFJ2O6pCcF0NgJGWgfVTLuS6nW0kgAss9rj\nHSkRkJjHTbixeNSruFcqZ4B5CMtgyJKa4LajIlbet/+XPbs4GlaF6M8e0RKbuA3Q\nbbnSHwQDj7A9i4CvAbQKsGu8HFGFpBl+rqJ5YA4wqS9HhWcMgmCZCcKtGeRcXaoq\nsxaBsbk13sZHgUnJ3f2W2F1qR2D+Q9XC1NM9tc3GtgFQKFwxvUMFGOTKZziaJP2z\nk/AYVzv2LJ6N\n-----END PUBLIC KEY-----\n"
+groups:
+  cmix:
+    prime: "F6FAC7E480EE519354C058BF856AEBDC43AD60141BAD5573910476D030A869979A7E23F5FC006B6CE1B1D7CDA849BDE46A145F80EE97C21AA2154FA3A5CF25C75E225C6F3384D3C0C6BEF5061B87E8D583BEFDF790ECD351F6D2B645E26904DE3F8A9861CC3EAD0AA40BD7C09C1F5F655A9E7BA7986B92B73FD9A6A69F54EFC92AC7E21D15C9B85A76084D1EEFBC4781B91E231E9CE5F007BC75A8656CBD98E282671C08A5400C4E4D039DE5FD63AA89A618C5668256B12672C66082F0348B6204DD0ADE58532C967D055A5D2C34C43DF9998820B5DFC4C49C6820191CB3EC81062AA51E23CEEA9A37AB523B24C0E93B440FDC17A50B219AB0D373014C25EE8F"
+    smallprime: "D6B35AA395D9287A5530C474D776EA2FCF5B815E89C9DB4C7BB7A9EFB8F3F34B"
+    generator: "B22FDF91EE6BA01BDE4969C1A986EA1F81C4A1795921403F3437D681D05E95167C2F6414CCB74AC8D6B3BA8C0E85C7E4DEB0E8B5256D37BC5C21C8BE068F5342858AFF2FC7FF2644EBED8B10271941C74C86CCD71AA6D2D98E4C8C70875044900F842998037A7DFB9BC63BAF1BC2800E73AF9615E4F5B869D4C6DE6E5F48FACE9CA594CC5D228CB7F763A0AD6BF6ED78B27F902D9ADA38A1FCD7D09E398CE377BB15A459044D3B8541DC6D8049B66AE1662682254E69FAD31CA0016251D0522EF8FE587A3F6E3AB1E5F9D8C2998874ABAB205217E95B234A7D3E69713B884918ADB57360B5DE97336C7DC2EB8A3FEFB0C4290E7A92FF5758529AC45273135427"
+  e2e:
+    prime: "E2EE983D031DC1DB6F1A7A67DF0E9A8E5561DB8E8D49413394C049B7A8ACCEDC298708F121951D9CF920EC5D146727AA4AE535B0922C688B55B3DD2AEDF6C01C94764DAB937935AA83BE36E67760713AB44A6337C20E7861575E745D31F8B9E9AD8412118C62A3E2E29DF46B0864D0C951C394A5CBBDC6ADC718DD2A3E041023DBB5AB23EBB4742DE9C1687B5B34FA48C3521632C4A530E8FFB1BC51DADDF453B0B2717C2BC6669ED76B4BDD5C9FF558E88F26E5785302BEDBCA23EAC5ACE92096EE8A60642FB61E8F3D24990B8CB12EE448EEF78E184C7242DD161C7738F32BF29A841698978825B4111B4BC3E1E198455095958333D776D8B2BEEED3A1A1A221A6E37E664A64B83981C46FFDDC1A45E3D5211AAF8BFBC072768C4F50D7D7803D2D4F278DE8014A47323631D7E064DE81C0C6BFA43EF0E6998860F1390B5D3FEACAF1696015CB79C3F9C2D93D961120CD0E5F12CBB687EAB045241F96789C38E89D796138E6319BE62E35D87B1048CA28BE389B575E994DCA755471584A09EC723742DC35873847AEF49F66E43873"
+    smallprime: "71774C1E818EE0EDB78D3D33EF874D472AB0EDC746A4A099CA6024DBD456676E14C3847890CA8ECE7C90762E8A3393D525729AD849163445AAD9EE9576FB600E4A3B26D5C9BC9AD541DF1B733BB0389D5A25319BE1073C30ABAF3A2E98FC5CF4D6C20908C63151F1714EFA3584326864A8E1CA52E5DEE356E38C6E951F020811EDDAD591F5DA3A16F4E0B43DAD9A7D2461A90B19625298747FD8DE28ED6EFA29D85938BE15E3334F6BB5A5EEAE4FFAAC74479372BC29815F6DE511F562D674904B7745303217DB0F479E924C85C658977224777BC70C2639216E8B0E3B9C7995F94D420B4C4BC412DA088DA5E1F0F0CC22A84ACAC199EBBB6C595F7769D0D0D110D371BF3325325C1CC0E237FEEE0D22F1EA908D57C5FDE0393B4627A86BEBC01E96A793C6F400A523991B18EBF0326F40E0635FD21F78734CC430789C85AE9FF56578B4B00AE5BCE1FCE16C9ECB089066872F8965DB43F55822920FCB3C4E1C744EBCB09C7318CDF3171AEC3D882465145F1C4DABAF4CA6E53AAA38AC2504F6391BA16E1AC39C23D77A4FB3721C39"
+    generator: "2"
+# === END YAML