diff --git a/Makefile b/Makefile
index 91e15eb01d807c207a7cfa1a14e3183c163682f4..024a763e48c59939759ab116683937dcb0870433 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@
 all:
 	cd chopzero_src; make
 	if [ -d cgc_spri ]; then cd cgc_spri; make; fi
+	$(PEDI_HOME)/pedi -m manifest.txt
 
 clean:
 	cd chopzero_src; make clean
diff --git a/tools/cfar.sh b/tools/cfar.sh
index 9d3d7c96f9d2f7ecbee05fc2b8220f625a563f34..dd56ac56270f274704aa20abaebbaf974edc08bc 100755
--- a/tools/cfar.sh
+++ b/tools/cfar.sh
@@ -1,5 +1,6 @@
-#!/bin/bash
+#!/bin/bash -x
 
+source $(dirname $0)/ps_wrapper.source $0
 
 is_so()
 {
@@ -162,9 +163,9 @@ do
 	myin=$(echo $in|sed "s/<<VARNUM>>/$seq/g")
 
 	# invoke $PS.
-	#echo "PGDATABASE=peasoup_${USER}_v$seq $zipr_env $PEASOUP_HOME/tools/ps_analyze.sh $in $baseoutdir/v${seq}/${in_base} " "${new_cmd_line_options[@]}"  "${per_variant_options[@]}" 
+	#echo "PGDATABASE=peasoup_${USER}_v$seq $zipr_env $PS $in $baseoutdir/v${seq}/${in_base} " "${new_cmd_line_options[@]}"  "${per_variant_options[@]}" 
 	set -x
-	PGDATABASE=peasoup_${USER}_v$seq $zipr_env $PEASOUP_HOME/tools/ps_analyze.sh $myin $baseoutdir/v${seq}/${in_base} "${new_cmd_line_options[@]}"  "${per_variant_options[@]}" > $baseoutdir/v${seq}/variant_output.txt 2>&1 &
+	PGDATABASE=peasoup_${USER}_v$seq $zipr_env $PS $myin $baseoutdir/v${seq}/${in_base} "${new_cmd_line_options[@]}"  "${per_variant_options[@]}" > $baseoutdir/v${seq}/variant_output.txt 2>&1 &
 
 	# remember the pid.
 	pids="$pids $!"
diff --git a/tools/cfar_configs/cfar_partProbNog_probNol_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_partProbNog_probNol_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh
index 43df32cd8620358dce26112d9958031b39211ee9..f67024ba7f3409670443619bc36e7706aac14932 100755
--- a/tools/cfar_configs/cfar_partProbNog_probNol_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_partProbNog_probNol_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh
@@ -1,5 +1,8 @@
 #!/bin/bash 
 
+source $(dirname $0)/../ps_wrapper.source $0
+
+
 file $2|grep "ELF 64-bit LSB  executable" > /dev/null
 if [ $? = 0 ]; then
 	$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step move_globals=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --step-option zipr:"--large_only:nog_on true" --step diehard=on --step noh=on --step nol=on
diff --git a/tools/cfar_configs/cfar_partStructNog_structNol_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_partStructNog_structNol_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
index 03fed96f6f7367319af13ab3717b373ef3fc3c3e..beb2d36486bd631d5f3289dc5d4da07e1f3527e9 100755
--- a/tools/cfar_configs/cfar_partStructNog_structNol_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_partStructNog_structNol_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
@@ -1,4 +1,6 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 file $2|grep "ELF 64-bit LSB  executable" > /dev/null
 if [ $? = 0 ]; then
diff --git a/tools/cfar_configs/cfar_probBilr_libtwitcher_zipr.sh b/tools/cfar_configs/cfar_probBilr_libtwitcher_zipr.sh
index 16f71bf028e24633b39cce7206bd158d8c83bde0..51b874083583b00a053baccac0274cad14498675 100755
--- a/tools/cfar_configs/cfar_probBilr_libtwitcher_zipr.sh
+++ b/tools/cfar_configs/cfar_probBilr_libtwitcher_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --config_name $(basename $0 .sh|sed "s/cfar_//") --step libtwitcher=on 
diff --git a/tools/cfar_configs/cfar_probBilr_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_probBilr_probHeaprand_zipr.sh
index f7a1b40b101009026eae59b02497c6ec06349ef1..85996a3aa2a5786be2c1674075dadc3c868b9e7a 100755
--- a/tools/cfar_configs/cfar_probBilr_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_probBilr_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --config_name $(basename $0 .sh|sed "s/cfar_//") --step diehard=on 
diff --git a/tools/cfar_configs/cfar_probBilr_probNoh_zipr.sh b/tools/cfar_configs/cfar_probBilr_probNoh_zipr.sh
index 52aa0273961070e95fd5a61f2ad0d7c2905446bb..27b3e1d8fddc9ee57b7bb3944463dd83d6f0d31d 100755
--- a/tools/cfar_configs/cfar_probBilr_probNoh_zipr.sh
+++ b/tools/cfar_configs/cfar_probBilr_probNoh_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --config_name $(basename $0 .sh|sed "s/cfar_//") --step noh=on
diff --git a/tools/cfar_configs/cfar_probBilr_probNos_probNol_probNoh_zipr.sh b/tools/cfar_configs/cfar_probBilr_probNos_probNol_probNoh_zipr.sh
index 20f4d64d7078f22a88b028d17012ec19cd19466f..f0fc41395de7f248def0a4a9ab0544f9ac2b520b 100755
--- a/tools/cfar_configs/cfar_probBilr_probNos_probNol_probNoh_zipr.sh
+++ b/tools/cfar_configs/cfar_probBilr_probNos_probNol_probNoh_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --step nol=on --step noh=on
diff --git a/tools/cfar_configs/cfar_probBilr_probNos_probNol_zipr.sh b/tools/cfar_configs/cfar_probBilr_probNos_probNol_zipr.sh
index 080574127199bce89432998ffe3ffb47f3a68e0f..15d604e72946a451ea22859ff9ac68c8a66c404e 100755
--- a/tools/cfar_configs/cfar_probBilr_probNos_probNol_zipr.sh
+++ b/tools/cfar_configs/cfar_probBilr_probNos_probNol_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --step nol=on
diff --git a/tools/cfar_configs/cfar_probBilr_probNos_zipr.sh b/tools/cfar_configs/cfar_probBilr_probNos_zipr.sh
index fcb21700ddaff028daa0dacfb018500f0e6bae00..83eae91918828f7232a7e086fc9edd27d384d800 100755
--- a/tools/cfar_configs/cfar_probBilr_probNos_zipr.sh
+++ b/tools/cfar_configs/cfar_probBilr_probNos_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") 
diff --git a/tools/cfar_configs/cfar_probBilr_probP1_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_probBilr_probP1_probHeaprand_zipr.sh
index 70f0d725e8d088312902ddde67068cd26f5e41ab..5a697cb8712cfceb40a350ab2fa91cebd63c718d 100755
--- a/tools/cfar_configs/cfar_probBilr_probP1_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_probBilr_probP1_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step diehard=on
diff --git a/tools/cfar_configs/cfar_probBilr_probP1_probNos_probNol_probNoh_zipr.sh b/tools/cfar_configs/cfar_probBilr_probP1_probNos_probNol_probNoh_zipr.sh
index 289aee070ea1e37183a3f6f10b214c3d1b934525..4a1e79396fdd666a1d9a0e9196ba067a79258033 100755
--- a/tools/cfar_configs/cfar_probBilr_probP1_probNos_probNol_probNoh_zipr.sh
+++ b/tools/cfar_configs/cfar_probBilr_probP1_probNos_probNol_probNoh_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --step nol=on --step noh=on
diff --git a/tools/cfar_configs/cfar_probBilr_probP1_probNos_probNol_zipr.sh b/tools/cfar_configs/cfar_probBilr_probP1_probNos_probNol_zipr.sh
index 01bd06ec33e27dc54190c3b9294cd8abf9b4c22b..38b68675398ca10c90e4c76efe9a7635464f3420 100755
--- a/tools/cfar_configs/cfar_probBilr_probP1_probNos_probNol_zipr.sh
+++ b/tools/cfar_configs/cfar_probBilr_probP1_probNos_probNol_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --step nol=on
diff --git a/tools/cfar_configs/cfar_probBilr_probP1_zipr.sh b/tools/cfar_configs/cfar_probBilr_probP1_zipr.sh
index 5c51c6e3ee3010cb81754da461e5090364366757..24043c958546aed0287e3b2dfe9864bf883919e6 100755
--- a/tools/cfar_configs/cfar_probBilr_probP1_zipr.sh
+++ b/tools/cfar_configs/cfar_probBilr_probP1_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_probBilr_zipr.sh b/tools/cfar_configs/cfar_probBilr_zipr.sh
index 6fdb14fc8c01544c984383ff2fe4761478bfb311..c5de13438aa4f27ea18d4ed289d1a19580721e8e 100755
--- a/tools/cfar_configs/cfar_probBilr_zipr.sh
+++ b/tools/cfar_configs/cfar_probBilr_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_probIlr_probP1_probHeaprand_probNos_strata.sh b/tools/cfar_configs/cfar_probIlr_probP1_probHeaprand_probNos_strata.sh
index 6c89b9585f522032279065651e17b8f8fee0e1be..01f4094d7fbce10f1529e3f1480825b0457d6217 100755
--- a/tools/cfar_configs/cfar_probIlr_probP1_probHeaprand_probNos_strata.sh
+++ b/tools/cfar_configs/cfar_probIlr_probP1_probHeaprand_probNos_strata.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend strata --step non_overlapping_stack=on --step ilr=on --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step diehard=on
diff --git a/tools/cfar_configs/cfar_probIlr_probP1_probHeaprand_strata.sh b/tools/cfar_configs/cfar_probIlr_probP1_probHeaprand_strata.sh
index f48737f1f52b0447d6354139182b9c173592cd50..2158f400f6e093f2d610f3cdcca00b2892f5e55b 100755
--- a/tools/cfar_configs/cfar_probIlr_probP1_probHeaprand_strata.sh
+++ b/tools/cfar_configs/cfar_probIlr_probP1_probHeaprand_strata.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend strata --step ilr=on --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step diehard=on
diff --git a/tools/cfar_configs/cfar_probIlr_probP1_strata.sh b/tools/cfar_configs/cfar_probIlr_probP1_strata.sh
index b49c43208f9348a7396ab0afd33c1ce366111d09..50987a15599ed5b9bc8e03cd1adcab0f1cdba6bf 100755
--- a/tools/cfar_configs/cfar_probIlr_probP1_strata.sh
+++ b/tools/cfar_configs/cfar_probIlr_probP1_strata.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend strata --step ilr=on --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_probIlr_strata.sh b/tools/cfar_configs/cfar_probIlr_strata.sh
index 086a0432e8c6a3c9e0d56907b41f2250b91eaa89..6041c3f9adacd4fb297fb4f0af7eff00605bb99b 100755
--- a/tools/cfar_configs/cfar_probIlr_strata.sh
+++ b/tools/cfar_configs/cfar_probIlr_strata.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend strata --step ilr=on --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_probNos_strata.sh b/tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_probNos_strata.sh
index 80671d6369d63c9c02e743896ec8bf42779984e6..c624a6b092d393fb15a8e6219553b5aca1c50136 100755
--- a/tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_probNos_strata.sh
+++ b/tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_probNos_strata.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend strata --step ilr=on --structured_p1_canaries --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step diehard=on --step non_overlapping_stack=on
diff --git a/tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_strata.sh b/tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_strata.sh
index 7ffe24f9e831a5ded727249dfeea4a725e16f6cb..b2870be62d53a556b1189d315d30a5be0cdbe277 100755
--- a/tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_strata.sh
+++ b/tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_strata.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend strata --step ilr=on --structured_p1_canaries --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step diehard=on
diff --git a/tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_structNos_strata.sh b/tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_structNos_strata.sh
index 5f1fe7bdf8e54d215d8047b7cdf533413b6b2d6b..655bb3bfbf1c3c3b74806010e61afd2f566db501 100755
--- a/tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_structNos_strata.sh
+++ b/tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_structNos_strata.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend strata --step ilr=on --structured_p1_canaries --structured_nos --step non_overlapping_stack=on --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step diehard=on
diff --git a/tools/cfar_configs/cfar_probIlr_structP1Canaries_strata.sh b/tools/cfar_configs/cfar_probIlr_structP1Canaries_strata.sh
index 87bc59f315444f0b01838470c0b8b078bf0a1c55..d04ace820fe4678ca44e11195398bdfa3b6afef8 100755
--- a/tools/cfar_configs/cfar_probIlr_structP1Canaries_strata.sh
+++ b/tools/cfar_configs/cfar_probIlr_structP1Canaries_strata.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend strata --step ilr=on --structured_p1_canaries --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_probNog_phase1_zipr.sh b/tools/cfar_configs/cfar_probNog_phase1_zipr.sh
index 26d127592c1cee60af8b33aa83c187faa3c8f99c..8563eb45c8d024f8272eccdd7c1438b355b36e4d 100755
--- a/tools/cfar_configs/cfar_probNog_phase1_zipr.sh
+++ b/tools/cfar_configs/cfar_probNog_phase1_zipr.sh
@@ -1,4 +1,6 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step move_globals=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --step-option zipr:"--large_only:nog_on true" --step noh=on --step nol=on
 
diff --git a/tools/cfar_configs/cfar_probNog_probNol_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_probNog_probNol_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh
index 040067b49c5a36de39430ef7aadbe25aa19ab832..3ab21ad92204e131ac225c44f7083bea74357ca2 100755
--- a/tools/cfar_configs/cfar_probNog_probNol_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_probNog_probNol_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step move_globals=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --step-option zipr:"--large_only:nog_on true" --step noh=on --step nol=on
diff --git a/tools/cfar_configs/cfar_probNog_probSS_probDS_phase1_zipr.sh b/tools/cfar_configs/cfar_probNog_probSS_probDS_phase1_zipr.sh
index 243e2640bec768d3f46c2a0df82821e4b8c23682..f572105f69e8562dc960518559e660260d61f553 100755
--- a/tools/cfar_configs/cfar_probNog_probSS_probDS_phase1_zipr.sh
+++ b/tools/cfar_configs/cfar_probNog_probSS_probDS_phase1_zipr.sh
@@ -1,4 +1,6 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 #
 # The calling script is responsible for setting up the options for duck_season
diff --git a/tools/cfar_configs/cfar_probNoh_probIlr_probP1_probHeaprand_probNos_strata.sh b/tools/cfar_configs/cfar_probNoh_probIlr_probP1_probHeaprand_probNos_strata.sh
index db8abe90e894aec3fa4346545f8496a4feaf9815..63f9fcd277c8b897a2d5ace24ab532d7d8aab6d3 100755
--- a/tools/cfar_configs/cfar_probNoh_probIlr_probP1_probHeaprand_probNos_strata.sh
+++ b/tools/cfar_configs/cfar_probNoh_probIlr_probP1_probHeaprand_probNos_strata.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend strata --step non_overlapping_stack=on --step ilr=on --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step diehard=on --step noh=on
diff --git a/tools/cfar_configs/cfar_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh
index 8a20998d2a133661129c6b1dbf7a55654bff90b0..a3e5157e26ccf7ccabe9f58ce4f1bceacb032d1b 100755
--- a/tools/cfar_configs/cfar_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step noh=on
diff --git a/tools/cfar_configs/cfar_probNol_probNoh_probIlr_probP1_probHeaprand_probNos_strata.sh b/tools/cfar_configs/cfar_probNol_probNoh_probIlr_probP1_probHeaprand_probNos_strata.sh
index b9a00546e81c96052b8eb7ae58aae589e53e67de..947add2b56895b6d8b8bf05de318c438d52ee73c 100755
--- a/tools/cfar_configs/cfar_probNol_probNoh_probIlr_probP1_probHeaprand_probNos_strata.sh
+++ b/tools/cfar_configs/cfar_probNol_probNoh_probIlr_probP1_probHeaprand_probNos_strata.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 # nol, noh not set here, passed only to gen_mvee_config.
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend strata --step non_overlapping_stack=on --step ilr=on --step p1transform=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --config_name $(basename $0 .sh|sed "s/cfar_//") --step diehard=on --step noh=on --step nol=on
diff --git a/tools/cfar_configs/cfar_probNol_probNoh_probNos_probBilr_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_probNol_probNoh_probNos_probBilr_probHeaprand_zipr.sh
index 35399c59b5401044e02028e0ec13c1e20b8e79f3..5bad90d8ae05bd65328403912ea270c9b270734b 100755
--- a/tools/cfar_configs/cfar_probNol_probNoh_probNos_probBilr_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_probNol_probNoh_probNos_probBilr_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step non_overlapping_stack=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --config_name $(basename $0 .sh|sed "s/cfar_//") --step noh=on --step nol=on
diff --git a/tools/cfar_configs/cfar_probNol_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_probNol_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh
index 2a1e826dbe72da9121b22d9fc87c2f3f14cb07f1..2aee260214d5d0b0d46ba8d9390a8ccd1dc4c389 100755
--- a/tools/cfar_configs/cfar_probNol_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_probNol_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step p1transform=on --step non_overlapping_stack=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --config_name $(basename $0 .sh|sed "s/cfar_//") --step noh=on --step nol=on
diff --git a/tools/cfar_configs/cfar_probNos_probBilr_probP1_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_probNos_probBilr_probP1_probHeaprand_zipr.sh
index 12a5fc4c237f1cac4471e03e58d5f6c434f7283c..25e97f3146aff988dc55d66f33f20f5885155130 100755
--- a/tools/cfar_configs/cfar_probNos_probBilr_probP1_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_probNos_probBilr_probP1_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_probNos_structNoc_structP1Canaries_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_probNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
index 5f4abfd58e7038be74a21da6a3f860b759daffea..482ed7caed2e0d5ad5d994069ee41fa460ec7e87 100755
--- a/tools/cfar_configs/cfar_probNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_probNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step-option zipr:"--zipr:seed $$" --structured_noc --step-option zipr:"--large_only:on true" --structured_p1_canaries  --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_probP1FloatingCanary_zipr.sh b/tools/cfar_configs/cfar_probP1FloatingCanary_zipr.sh
index 0ec10d36ef5aabeebdf3db7f4be1fadd248393d4..941fbf768d7dd9ed6f735a3e0b43bc38584474ec 100755
--- a/tools/cfar_configs/cfar_probP1FloatingCanary_zipr.sh
+++ b/tools/cfar_configs/cfar_probP1FloatingCanary_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step p1transform=on --step-option p1transform:"--canaries=on --floating_canary" --step-option zipr:"--zipr:seed $$" --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_probP1_strata.sh b/tools/cfar_configs/cfar_probP1_strata.sh
index 70b538320eab726848a5627a967d0c5f4fd9aba8..eea0751c163b2cc7334ee33c825b8b23d0a4d412 100755
--- a/tools/cfar_configs/cfar_probP1_strata.sh
+++ b/tools/cfar_configs/cfar_probP1_strata.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 SPASM_SEED=$$ $PEASOUP_HOME/tools/cfar.sh "$@" --step p1transform=on   --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_probP1_zipr.sh b/tools/cfar_configs/cfar_probP1_zipr.sh
index 072c34081807d110221ee68a38e07d3ce0735a64..4dc8ab5672ef42b247e81563d30e5786b3d7626a 100755
--- a/tools/cfar_configs/cfar_probP1_zipr.sh
+++ b/tools/cfar_configs/cfar_probP1_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step p1transform=on --step-option zipr:"--zipr:seed $$" --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_scfi_zipr.sh b/tools/cfar_configs/cfar_scfi_zipr.sh
index f40fb0471abfaa151942eeb85a5990becd09607e..6b138a9fd0e08a4e6a83660473cf9062762de5a2 100755
--- a/tools/cfar_configs/cfar_scfi_zipr.sh
+++ b/tools/cfar_configs/cfar_scfi_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --config_name $(basename $0 .sh|sed "s/cfar_//") --step move_globals=on --step-option move_globals:--cfi --step selective_cfi=on --step-option selective_cfi:--multimodule --step-option fix_calls:--fix-all  --backend zipr
diff --git a/tools/cfar_configs/cfar_structNoc_probP1_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_structNoc_probP1_probHeaprand_zipr.sh
index 6e30e8da45f74aa997323c1d64d359de1a0cc839..2b0d764e415dfdc54957431155b2f9232fffb204 100755
--- a/tools/cfar_configs/cfar_structNoc_probP1_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_structNoc_probP1_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step-option zipr:"--zipr:seed $$" --structured_noc --step-option zipr:"--large_only:on true" --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step diehard=on
diff --git a/tools/cfar_configs/cfar_structNoc_probP1_zipr.sh b/tools/cfar_configs/cfar_structNoc_probP1_zipr.sh
index a39f99ca6e0dca6612f06ac9f4f0d19300f4cf44..7e1e440c6289beaee2741f67e0f8d79cd879b4ad 100755
--- a/tools/cfar_configs/cfar_structNoc_probP1_zipr.sh
+++ b/tools/cfar_configs/cfar_structNoc_probP1_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step-option zipr:"--zipr:seed $$" --structured_noc --step-option zipr:"--large_only:on true" --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_structNoc_structNoh_zipr.sh b/tools/cfar_configs/cfar_structNoc_structNoh_zipr.sh
index 7135d7827c398210dc6334d16856ccb37ef9eb9e..59b22d3fb731fb2088e521534e53f3a2f46d2229 100755
--- a/tools/cfar_configs/cfar_structNoc_structNoh_zipr.sh
+++ b/tools/cfar_configs/cfar_structNoc_structNoh_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step-option zipr:"--zipr:seed $$" --structured_noc --step-option zipr:"--large_only:on true" --config_name $(basename $0 .sh|sed "s/cfar_//") --step noh=on
diff --git a/tools/cfar_configs/cfar_structNoc_structNos_structNol_structNoh_zipr.sh b/tools/cfar_configs/cfar_structNoc_structNos_structNol_structNoh_zipr.sh
index 0a1bf9d3cf9730ef30e4c69410fc7373d55efaed..944f4716648395f28ef263cd76cc23ba3a2dbe93 100755
--- a/tools/cfar_configs/cfar_structNoc_structNos_structNol_structNoh_zipr.sh
+++ b/tools/cfar_configs/cfar_structNoc_structNos_structNol_structNoh_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --step nol=on --step noh=on
diff --git a/tools/cfar_configs/cfar_structNoc_structNos_structNol_zipr.sh b/tools/cfar_configs/cfar_structNoc_structNos_structNol_zipr.sh
index 59ec527b65a4b539e88f55f97c2b98b927569487..efb86807add0367a9be6f91d269eadd72292973e 100755
--- a/tools/cfar_configs/cfar_structNoc_structNos_structNol_zipr.sh
+++ b/tools/cfar_configs/cfar_structNoc_structNos_structNol_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --step nol=on
diff --git a/tools/cfar_configs/cfar_structNoc_structNos_zipr.sh b/tools/cfar_configs/cfar_structNoc_structNos_zipr.sh
index f4ab40d954bbd3acc3bfaf4a3cd658c8eb17525f..eadecbe8835544ee14e8f8c36e9fb05aa2b3ae56 100755
--- a/tools/cfar_configs/cfar_structNoc_structNos_zipr.sh
+++ b/tools/cfar_configs/cfar_structNoc_structNos_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") 
diff --git a/tools/cfar_configs/cfar_structNoc_structP1Canaries_probBilr_zipr.sh b/tools/cfar_configs/cfar_structNoc_structP1Canaries_probBilr_zipr.sh
index 93f4f3f0685e5e189c3330c39655e5d1350f0e80..dd7d181c68595a54c03056d63b82ca57c57be960 100755
--- a/tools/cfar_configs/cfar_structNoc_structP1Canaries_probBilr_zipr.sh
+++ b/tools/cfar_configs/cfar_structNoc_structP1Canaries_probBilr_zipr.sh
@@ -1,4 +1,6 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 echo NOC+Bilr generates working binaries, but Bilr is not yet applied.  Avoid this config for now.
 exit 1
diff --git a/tools/cfar_configs/cfar_structNoc_structP1Canaries_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_structNoc_structP1Canaries_probHeaprand_zipr.sh
index 30fc4b4325fdf237c1a1f501e37020b96418015f..66d207dcc2fbb956157bedbe29c3285b1afeb436 100755
--- a/tools/cfar_configs/cfar_structNoc_structP1Canaries_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_structNoc_structP1Canaries_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step-option zipr:"--zipr:seed $$" --structured_noc --step-option zipr:"--large_only:on true" --structured_p1_canaries  --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_structNoc_structP1Canaries_structNos_structNol_structNoh_zipr.sh b/tools/cfar_configs/cfar_structNoc_structP1Canaries_structNos_structNol_structNoh_zipr.sh
index 2f7a99275757c014eb36c4509a8ea14a09185dbf..e94b8402b78a53818e97a65266a448f2f93b2aa4 100755
--- a/tools/cfar_configs/cfar_structNoc_structP1Canaries_structNos_structNol_structNoh_zipr.sh
+++ b/tools/cfar_configs/cfar_structNoc_structP1Canaries_structNos_structNol_structNoh_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --step nol=on --structured_p1_canaries  --step p1transform=on  --step noh=on
diff --git a/tools/cfar_configs/cfar_structNoc_structP1Canaries_structNos_structNol_zipr.sh b/tools/cfar_configs/cfar_structNoc_structP1Canaries_structNos_structNol_zipr.sh
index 7069eaf3a9e615b6b9c522b2e66ff73e25559609..d4a92f86f829e2d21982d62726cee6c13eb854ce 100755
--- a/tools/cfar_configs/cfar_structNoc_structP1Canaries_structNos_structNol_zipr.sh
+++ b/tools/cfar_configs/cfar_structNoc_structP1Canaries_structNos_structNol_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --step nol=on --structured_p1_canaries  --step p1transform=on 
diff --git a/tools/cfar_configs/cfar_structNoc_structP1Canaries_zipr.sh b/tools/cfar_configs/cfar_structNoc_structP1Canaries_zipr.sh
index cd2fb5d85444663723bf04c65ca367258bad9f76..a293667b3f61fa4c80489a453b042c210bd65c32 100755
--- a/tools/cfar_configs/cfar_structNoc_structP1Canaries_zipr.sh
+++ b/tools/cfar_configs/cfar_structNoc_structP1Canaries_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step-option zipr:"--zipr:seed $$" --structured_noc --step-option zipr:"--large_only:on true" --structured_p1_canaries  --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_structNoc_structP1FloatingCanaries_structNos_structNol_structNoh_zipr.sh b/tools/cfar_configs/cfar_structNoc_structP1FloatingCanaries_structNos_structNol_structNoh_zipr.sh
index f6df67ed5a54d9f5501b923f705a7a36312ce663..30b741a4023cecde236f09619b77725d76ac73c4 100755
--- a/tools/cfar_configs/cfar_structNoc_structP1FloatingCanaries_structNos_structNol_structNoh_zipr.sh
+++ b/tools/cfar_configs/cfar_structNoc_structP1FloatingCanaries_structNos_structNol_structNoh_zipr.sh
@@ -1,4 +1,6 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 if [ ! -z $NO_FLOAT ];
 then
diff --git a/tools/cfar_configs/cfar_structNoc_zipr.sh b/tools/cfar_configs/cfar_structNoc_zipr.sh
index 095f63624bfb144de55eb99b5d9e2a8deda7257f..46c4927531af6951aae0f9b0fde5a7098310f166 100755
--- a/tools/cfar_configs/cfar_structNoc_zipr.sh
+++ b/tools/cfar_configs/cfar_structNoc_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step-option zipr:"--zipr:seed $$" --structured_noc --step-option zipr:"--large_only:on true" --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_structNogOF_phase1_zipr.sh b/tools/cfar_configs/cfar_structNogOF_phase1_zipr.sh
index d116d2b4703c67616e37795d62b29edbbb0a8a32..f63e955f64f2a43d83010732b4b9f424f698006a 100755
--- a/tools/cfar_configs/cfar_structNogOF_phase1_zipr.sh
+++ b/tools/cfar_configs/cfar_structNogOF_phase1_zipr.sh
@@ -1,4 +1,6 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --structured_p1_canaries  --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step move_globals=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --structured_nog --step-option zipr:"--large_only:nog_on true --large_only:overflow_protection true" --step noh=on --step nol=on
 
diff --git a/tools/cfar_configs/cfar_structNogOF_structSS_phase1_zipr.sh b/tools/cfar_configs/cfar_structNogOF_structSS_phase1_zipr.sh
index 2da6d60d06f5a989eafeb660efe7debf63a2186a..a8099d7d496cd06f721e388c70fffc6b9a996154 100755
--- a/tools/cfar_configs/cfar_structNogOF_structSS_phase1_zipr.sh
+++ b/tools/cfar_configs/cfar_structNogOF_structSS_phase1_zipr.sh
@@ -1,4 +1,6 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --structured_p1_canaries  --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step move_globals=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --structured_nog --step-option zipr:"--large_only:nog_on true --large_only:overflow_protection true" --step noh=on --step nol=on --step stack_stamp=on --structured_stack_stamp
 
diff --git a/tools/cfar_configs/cfar_structNogOF_structSS_probDS_phase1_zipr.sh b/tools/cfar_configs/cfar_structNogOF_structSS_probDS_phase1_zipr.sh
index 6219e640de7989a89c08db4b4a5ab96921280a9a..93359588faa544c0fe179bc18cf58f708ba305c6 100755
--- a/tools/cfar_configs/cfar_structNogOF_structSS_probDS_phase1_zipr.sh
+++ b/tools/cfar_configs/cfar_structNogOF_structSS_probDS_phase1_zipr.sh
@@ -1,4 +1,6 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --structured_p1_canaries  --step p1transform=on --step duck_season=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step move_globals=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --structured_nog --step-option zipr:"--large_only:nog_on true --large_only:overflow_protection true" --step noh=on --step nol=on --step stack_stamp=on --structured_stack_stamp
 
diff --git a/tools/cfar_configs/cfar_structNog_phase1_zipr.sh b/tools/cfar_configs/cfar_structNog_phase1_zipr.sh
index f05957ade009b4bd679e7c2f781c0b2b690d9b93..010bf86bb623e7eac8a176388933874565b2b2ec 100755
--- a/tools/cfar_configs/cfar_structNog_phase1_zipr.sh
+++ b/tools/cfar_configs/cfar_structNog_phase1_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --structured_p1_canaries  --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step move_globals=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --structured_nog --step-option zipr:"--large_only:nog_on true" --step noh=on --step nol=on
diff --git a/tools/cfar_configs/cfar_structNog_structNol_structNoh_structNos_structNoc_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_structNog_structNol_structNoh_structNos_structNoc_probHeaprand_zipr.sh
index 042a1d9e574574a25890a9314157fd0cec672e3f..28e9c6ecc996abdac5e7cd2bddc15ee0e23d13de 100755
--- a/tools/cfar_configs/cfar_structNog_structNol_structNoh_structNos_structNoc_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_structNog_structNol_structNoh_structNos_structNoc_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step move_globals=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --structured_nog --step-option zipr:"--large_only:nog_on true" --step noh=on --step nol=on
diff --git a/tools/cfar_configs/cfar_structNog_structNol_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_structNog_structNol_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
index f05957ade009b4bd679e7c2f781c0b2b690d9b93..010bf86bb623e7eac8a176388933874565b2b2ec 100755
--- a/tools/cfar_configs/cfar_structNog_structNol_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_structNog_structNol_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --structured_p1_canaries  --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step move_globals=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --structured_nog --step-option zipr:"--large_only:nog_on true" --step noh=on --step nol=on
diff --git a/tools/cfar_configs/cfar_structNoh_probIlr_structP1Canaries_probHeaprand_structNos_strata.sh b/tools/cfar_configs/cfar_structNoh_probIlr_structP1Canaries_probHeaprand_structNos_strata.sh
index 40c464ddcba5a4bcb28ad6dc8f70425441083af9..a2fa3391682ca367fd40c35388c37a596c55be25 100755
--- a/tools/cfar_configs/cfar_structNoh_probIlr_structP1Canaries_probHeaprand_structNos_strata.sh
+++ b/tools/cfar_configs/cfar_structNoh_probIlr_structP1Canaries_probHeaprand_structNos_strata.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend strata --step ilr=on --structured_p1_canaries --structured_nos --step non_overlapping_stack=on --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step diehard=on --step noh=on
diff --git a/tools/cfar_configs/cfar_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
index 0c4ab392042650ac09fef70972cf151e47a72b89..56507e9d8069c54de1fd415ddd783c8219cf01ed 100755
--- a/tools/cfar_configs/cfar_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --structured_p1_canaries  --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step noh=on
diff --git a/tools/cfar_configs/cfar_structNol_structNoh_probIlr_structP1Canaries_probHeaprand_structNos_strata.sh b/tools/cfar_configs/cfar_structNol_structNoh_probIlr_structP1Canaries_probHeaprand_structNos_strata.sh
index 14b0e394f55ffcea1abedfb8fd1c604cd6229a13..ea3685b4b69a6a1b3b7533793ec5497b342a6157 100755
--- a/tools/cfar_configs/cfar_structNol_structNoh_probIlr_structP1Canaries_probHeaprand_structNos_strata.sh
+++ b/tools/cfar_configs/cfar_structNol_structNoh_probIlr_structP1Canaries_probHeaprand_structNos_strata.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend strata --step ilr=on --structured_p1_canaries --structured_nos --step non_overlapping_stack=on --step p1transform=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --config_name $(basename $0 .sh|sed "s/cfar_//") --step diehard=on --step noh=on --step nol=on
diff --git a/tools/cfar_configs/cfar_structNol_structNoh_structNos_structNoc_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_structNol_structNoh_structNos_structNoc_probHeaprand_zipr.sh
index f1648b7ce3e7396cd35cde39b3c5c1563270ba8d..2165f4266a66df34542d44e3541bc1a0ec0eba02 100755
--- a/tools/cfar_configs/cfar_structNol_structNoh_structNos_structNoc_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_structNol_structNoh_structNos_structNoc_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --step non_overlapping_stack=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --config_name $(basename $0 .sh|sed "s/cfar_//") --step noh=on --step nol=on
diff --git a/tools/cfar_configs/cfar_structNol_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_structNol_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
index 278c6e79aeb436f5e01b73b15215b5336366b307..59bfb348c1c2198c75dfbd70e3ae1582b131e162 100755
--- a/tools/cfar_configs/cfar_structNol_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_structNol_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --structured_p1_canaries  --step p1transform=on --step non_overlapping_stack=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --config_name $(basename $0 .sh|sed "s/cfar_//") --step noh=on --step nol=on
diff --git a/tools/cfar_configs/cfar_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
index 44d1778156778b3e7084bc350a1b1b0646ba102e..c54c8546d3e806148dc1255eef4bbc9ada12cf5d 100755
--- a/tools/cfar_configs/cfar_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --structured_p1_canaries  --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_structP1Canaries_zipr.sh b/tools/cfar_configs/cfar_structP1Canaries_zipr.sh
index 0c3ca5bc9b6dde4fd5d04bcf769a30384fc20996..9f04cfd0d8005d440f2c00cbfa37b87959d3ae09 100755
--- a/tools/cfar_configs/cfar_structP1Canaries_zipr.sh
+++ b/tools/cfar_configs/cfar_structP1Canaries_zipr.sh
@@ -1,3 +1,5 @@
 #!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 $PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step-option zipr:"--zipr:seed $$" --structured_p1_canaries  --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_structP1FloatingCanary_zipr.sh b/tools/cfar_configs/cfar_structP1FloatingCanary_zipr.sh
index 3923cf13237b813a2bf68f6525bd713998df44ee..6d87aec4ab9673e5333045279adb305a8b3b9bd2 100755
--- a/tools/cfar_configs/cfar_structP1FloatingCanary_zipr.sh
+++ b/tools/cfar_configs/cfar_structP1FloatingCanary_zipr.sh
@@ -1,4 +1,6 @@
 #!/bin/bash -x
+source $(dirname $0)/../ps_wrapper.source $0
+
 
 if [ ! -z $NO_FLOAT ];
 then