diff --git a/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Invalid.side.pot.Player8.txt.hp b/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Invalid.side.pot.Player8.txt.hp
index ec43928b..eb8f97ea 100644
--- a/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Invalid.side.pot.Player8.txt.hp
+++ b/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Invalid.side.pot.Player8.txt.hp
@@ -47,6 +47,10 @@
                     'street0_3BDone': False,
                     'street0_4BChance': False,
                     'street0_4BDone': False,
+                    'street0_FoldTo3BChance': False,
+                    'street0_FoldTo3BDone': False,
+                    'street0_FoldTo4BChance': False,
+                    'street0_FoldTo4BDone': False,
                     'street1Aggr': False,
                     'street1Bets': 0,
                     'street1CBChance': False,
@@ -141,6 +145,10 @@
                     'street0_3BDone': False,
                     'street0_4BChance': False,
                     'street0_4BDone': False,
+                    'street0_FoldTo3BChance': False,
+                    'street0_FoldTo3BDone': False,
+                    'street0_FoldTo4BChance': False,
+                    'street0_FoldTo4BDone': False,
                     'street1Aggr': False,
                     'street1Bets': 0,
                     'street1CBChance': False,
@@ -235,6 +243,10 @@
                     'street0_3BDone': False,
                     'street0_4BChance': False,
                     'street0_4BDone': False,
+                    'street0_FoldTo3BChance': False,
+                    'street0_FoldTo3BDone': False,
+                    'street0_FoldTo4BChance': False,
+                    'street0_FoldTo4BDone': False,
                     'street1Aggr': False,
                     'street1Bets': 0,
                     'street1CBChance': False,
@@ -329,6 +341,10 @@
                     'street0_3BDone': False,
                     'street0_4BChance': False,
                     'street0_4BDone': False,
+                    'street0_FoldTo3BChance': False,
+                    'street0_FoldTo3BDone': False,
+                    'street0_FoldTo4BChance': False,
+                    'street0_FoldTo4BDone': False,
                     'street1Aggr': False,
                     'street1Bets': 0,
                     'street1CBChance': False,
@@ -423,6 +439,10 @@
                     'street0_3BDone': False,
                     'street0_4BChance': False,
                     'street0_4BDone': False,
+                    'street0_FoldTo3BChance': False,
+                    'street0_FoldTo3BDone': False,
+                    'street0_FoldTo4BChance': False,
+                    'street0_FoldTo4BDone': False,
                     'street1Aggr': False,
                     'street1Bets': 0,
                     'street1CBChance': False,
@@ -517,6 +537,10 @@
                     'street0_3BDone': False,
                     'street0_4BChance': False,
                     'street0_4BDone': False,
+                    'street0_FoldTo3BChance': False,
+                    'street0_FoldTo3BDone': False,
+                    'street0_FoldTo4BChance': False,
+                    'street0_FoldTo4BDone': False,
                     'street1Aggr': False,
                     'street1Bets': 0,
                     'street1CBChance': False,
@@ -611,6 +635,10 @@
                     'street0_3BDone': False,
                     'street0_4BChance': False,
                     'street0_4BDone': False,
+                    'street0_FoldTo3BChance': False,
+                    'street0_FoldTo3BDone': False,
+                    'street0_FoldTo4BChance': False,
+                    'street0_FoldTo4BDone': False,
                     'street1Aggr': False,
                     'street1Bets': 0,
                     'street1CBChance': False,
@@ -705,6 +733,10 @@
                     'street0_3BDone': False,
                     'street0_4BChance': False,
                     'street0_4BDone': False,
+                    'street0_FoldTo3BChance': False,
+                    'street0_FoldTo3BDone': False,
+                    'street0_FoldTo4BChance': False,
+                    'street0_FoldTo4BDone': False,
                     'street1Aggr': True,
                     'street1Bets': 1,
                     'street1CBChance': True,
@@ -799,6 +831,10 @@
                     'street0_3BDone': False,
                     'street0_4BChance': False,
                     'street0_4BDone': False,
+                    'street0_FoldTo3BChance': False,
+                    'street0_FoldTo3BDone': False,
+                    'street0_FoldTo4BChance': False,
+                    'street0_FoldTo4BDone': False,
                     'street1Aggr': True,
                     'street1Bets': 0,
                     'street1CBChance': False,
diff --git a/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Real.side.pot.with.bad.collected.Biggest.stack.wins.txt.hp b/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Real.side.pot.with.bad.collected.Biggest.stack.wins.txt.hp
index 31b9a23c..18c28727 100644
--- a/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Real.side.pot.with.bad.collected.Biggest.stack.wins.txt.hp
+++ b/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Real.side.pot.with.bad.collected.Biggest.stack.wins.txt.hp
@@ -47,6 +47,10 @@
                     'street0_3BDone': False,
                     'street0_4BChance': False,
                     'street0_4BDone': False,
+                    'street0_FoldTo3BChance': False,
+                    'street0_FoldTo3BDone': False,
+                    'street0_FoldTo4BChance': False,
+                    'street0_FoldTo4BDone': False,
                     'street1Aggr': False,
                     'street1Bets': 0,
                     'street1CBChance': False,
@@ -141,6 +145,10 @@
                     'street0_3BDone': False,
                     'street0_4BChance': False,
                     'street0_4BDone': False,
+                    'street0_FoldTo3BChance': False,
+                    'street0_FoldTo3BDone': False,
+                    'street0_FoldTo4BChance': False,
+                    'street0_FoldTo4BDone': False,
                     'street1Aggr': False,
                     'street1Bets': 0,
                     'street1CBChance': False,
@@ -235,6 +243,10 @@
                     'street0_3BDone': False,
                     'street0_4BChance': False,
                     'street0_4BDone': False,
+                    'street0_FoldTo3BChance': False,
+                    'street0_FoldTo3BDone': False,
+                    'street0_FoldTo4BChance': False,
+                    'street0_FoldTo4BDone': False,
                     'street1Aggr': False,
                     'street1Bets': 0,
                     'street1CBChance': False,
@@ -329,6 +341,10 @@
                     'street0_3BDone': False,
                     'street0_4BChance': False,
                     'street0_4BDone': False,
+                    'street0_FoldTo3BChance': False,
+                    'street0_FoldTo3BDone': False,
+                    'street0_FoldTo4BChance': False,
+                    'street0_FoldTo4BDone': False,
                     'street1Aggr': False,
                     'street1Bets': 0,
                     'street1CBChance': False,
@@ -423,6 +439,10 @@
                     'street0_3BDone': False,
                     'street0_4BChance': False,
                     'street0_4BDone': False,
+                    'street0_FoldTo3BChance': False,
+                    'street0_FoldTo3BDone': False,
+                    'street0_FoldTo4BChance': False,
+                    'street0_FoldTo4BDone': False,
                     'street1Aggr': False,
                     'street1Bets': 0,
                     'street1CBChance': False,
@@ -517,6 +537,10 @@
                     'street0_3BDone': False,
                     'street0_4BChance': False,
                     'street0_4BDone': False,
+                    'street0_FoldTo3BChance': False,
+                    'street0_FoldTo3BDone': False,
+                    'street0_FoldTo4BChance': False,
+                    'street0_FoldTo4BDone': False,
                     'street1Aggr': False,
                     'street1Bets': 0,
                     'street1CBChance': False,
@@ -611,6 +635,10 @@
                     'street0_3BDone': False,
                     'street0_4BChance': False,
                     'street0_4BDone': False,
+                    'street0_FoldTo3BChance': False,
+                    'street0_FoldTo3BDone': False,
+                    'street0_FoldTo4BChance': False,
+                    'street0_FoldTo4BDone': False,
                     'street1Aggr': False,
                     'street1Bets': 0,
                     'street1CBChance': False,
@@ -705,6 +733,10 @@
                     'street0_3BDone': False,
                     'street0_4BChance': False,
                     'street0_4BDone': False,
+                    'street0_FoldTo3BChance': False,
+                    'street0_FoldTo3BDone': False,
+                    'street0_FoldTo4BChance': False,
+                    'street0_FoldTo4BDone': False,
                     'street1Aggr': True,
                     'street1Bets': 1,
                     'street1CBChance': False,
@@ -799,6 +831,10 @@
                     'street0_3BDone': False,
                     'street0_4BChance': False,
                     'street0_4BDone': False,
+                    'street0_FoldTo3BChance': False,
+                    'street0_FoldTo3BDone': False,
+                    'street0_FoldTo4BChance': False,
+                    'street0_FoldTo4BDone': False,
                     'street1Aggr': False,
                     'street1Bets': 0,
                     'street1CBChance': False,
diff --git a/pyfpdb/regression-test-files/cash/Winamax/Flop/PLO-FR-EUR-0.02-0.05-201009.Real.side.pot.with.bad.collected.txt.hp b/pyfpdb/regression-test-files/cash/Winamax/Flop/PLO-FR-EUR-0.02-0.05-201009.Real.side.pot.with.bad.collected.txt.hp
index 6e859733..59fe0747 100644
--- a/pyfpdb/regression-test-files/cash/Winamax/Flop/PLO-FR-EUR-0.02-0.05-201009.Real.side.pot.with.bad.collected.txt.hp
+++ b/pyfpdb/regression-test-files/cash/Winamax/Flop/PLO-FR-EUR-0.02-0.05-201009.Real.side.pot.with.bad.collected.txt.hp
@@ -47,6 +47,10 @@
                      'street0_3BDone': False,
                      'street0_4BChance': False,
                      'street0_4BDone': False,
+                     'street0_FoldTo3BChance': False,
+                     'street0_FoldTo3BDone': False,
+                     'street0_FoldTo4BChance': False,
+                     'street0_FoldTo4BDone': False,
                      'street1Aggr': True,
                      'street1Bets': 1,
                      'street1CBChance': False,
@@ -141,6 +145,10 @@
                      'street0_3BDone': False,
                      'street0_4BChance': False,
                      'street0_4BDone': False,
+                     'street0_FoldTo3BChance': False,
+                     'street0_FoldTo3BDone': False,
+                     'street0_FoldTo4BChance': False,
+                     'street0_FoldTo4BDone': False,
                      'street1Aggr': False,
                      'street1Bets': 0,
                      'street1CBChance': False,
@@ -235,6 +243,10 @@
                      'street0_3BDone': False,
                      'street0_4BChance': False,
                      'street0_4BDone': False,
+                     'street0_FoldTo3BChance': False,
+                     'street0_FoldTo3BDone': False,
+                     'street0_FoldTo4BChance': False,
+                     'street0_FoldTo4BDone': False,
                      'street1Aggr': False,
                      'street1Bets': 0,
                      'street1CBChance': False,
@@ -329,6 +341,10 @@
                      'street0_3BDone': False,
                      'street0_4BChance': False,
                      'street0_4BDone': False,
+                     'street0_FoldTo3BChance': False,
+                     'street0_FoldTo3BDone': False,
+                     'street0_FoldTo4BChance': False,
+                     'street0_FoldTo4BDone': False,
                      'street1Aggr': False,
                      'street1Bets': 0,
                      'street1CBChance': False,
@@ -423,6 +439,10 @@
                      'street0_3BDone': False,
                      'street0_4BChance': False,
                      'street0_4BDone': False,
+                     'street0_FoldTo3BChance': False,
+                     'street0_FoldTo3BDone': False,
+                     'street0_FoldTo4BChance': False,
+                     'street0_FoldTo4BDone': False,
                      'street1Aggr': False,
                      'street1Bets': 0,
                      'street1CBChance': False,
@@ -517,6 +537,10 @@
                      'street0_3BDone': False,
                      'street0_4BChance': False,
                      'street0_4BDone': False,
+                     'street0_FoldTo3BChance': False,
+                     'street0_FoldTo3BDone': False,
+                     'street0_FoldTo4BChance': False,
+                     'street0_FoldTo4BDone': False,
                      'street1Aggr': False,
                      'street1Bets': 0,
                      'street1CBChance': False,
@@ -611,6 +635,10 @@
                      'street0_3BDone': False,
                      'street0_4BChance': False,
                      'street0_4BDone': False,
+                     'street0_FoldTo3BChance': False,
+                     'street0_FoldTo3BDone': False,
+                     'street0_FoldTo4BChance': False,
+                     'street0_FoldTo4BDone': False,
                      'street1Aggr': False,
                      'street1Bets': 0,
                      'street1CBChance': False,
@@ -705,6 +733,10 @@
                     'street0_3BDone': False,
                     'street0_4BChance': False,
                     'street0_4BDone': False,
+                    'street0_FoldTo3BChance': False,
+                    'street0_FoldTo3BDone': False,
+                    'street0_FoldTo4BChance': False,
+                    'street0_FoldTo4BDone': False,
                     'street1Aggr': False,
                     'street1Bets': 0,
                     'street1CBChance': False,
@@ -799,6 +831,10 @@
                     'street0_3BDone': False,
                     'street0_4BChance': False,
                     'street0_4BDone': False,
+                    'street0_FoldTo3BChance': False,
+                    'street0_FoldTo3BDone': False,
+                    'street0_FoldTo4BChance': False,
+                    'street0_FoldTo4BDone': False,
                     'street1Aggr': False,
                     'street1Bets': 0,
                     'street1CBChance': False,