diff --git a/fuzzers/FRET/benchmark/.gitignore b/fuzzers/FRET/benchmark/.gitignore
index a6a7e9ee50..ca395055a3 100644
--- a/fuzzers/FRET/benchmark/.gitignore
+++ b/fuzzers/FRET/benchmark/.gitignore
@@ -10,4 +10,6 @@ bins
 .snakemake
 *.zip
 *.tar.*
-*.sqlite
\ No newline at end of file
+*.sqlite
+eval*
+test_*
diff --git a/fuzzers/FRET/benchmark/build_all_demos.sh b/fuzzers/FRET/benchmark/build_all_demos.sh
old mode 100644
new mode 100755
index 25ed297aff..03022802e9
--- a/fuzzers/FRET/benchmark/build_all_demos.sh
+++ b/fuzzers/FRET/benchmark/build_all_demos.sh
@@ -1,8 +1,12 @@
+#!/usr/bin/env bash
+export INSERT_WC=${2:-0}
+export BUILD_DIR=${1:-build}
+mkdir -p $BUILD_DIR
+
 build () {
-    make -C ../../../../FreeRTOS/FreeRTOS/Demo/CORTEX_M3_MPS2_QEMU_GCC clean && make -C ../../../../FreeRTOS/FreeRTOS/Demo/CORTEX_M3_MPS2_QEMU_GCC $1=1 IGNORE_INTERRUPTS=$IGNORE_INTERRUPTS IGNORE_BYTES=$IGNORE_BYTES IGNORE_INTERNAL_STATE=$IGNORE_INTERNAL_STATE
-    cp ../../../../FreeRTOS/FreeRTOS/Demo/CORTEX_M3_MPS2_QEMU_GCC/build/RTOSDemo.axf build/$(echo $1 | cut -d_ -f1 | tr '[:upper:]' '[:lower:]')$2.elf 
+    make -C ../../../../FreeRTOS/FreeRTOS/Demo/CORTEX_M3_MPS2_QEMU_GCC clean && make -C ../../../../FreeRTOS/FreeRTOS/Demo/CORTEX_M3_MPS2_QEMU_GCC $1=1 IGNORE_INTERRUPTS=$IGNORE_INTERRUPTS IGNORE_BYTES=$IGNORE_BYTES IGNORE_INTERNAL_STATE=$IGNORE_INTERNAL_STATE INSERT_WC=$INSERT_WC $EXTRA_MAKE_ARGS
+    cp ../../../../FreeRTOS/FreeRTOS/Demo/CORTEX_M3_MPS2_QEMU_GCC/build/RTOSDemo.axf $BUILD_DIR/$(echo $1 | cut -d_ -f1 | tr '[:upper:]' '[:lower:]')$EXTRA_NAME_SUFFIX$2.elf
 }
-# INSERT_WC=1
 
 mkdir -p build
 
@@ -109,3 +113,13 @@ export IGNORE_INTERRUPTS=0 IGNORE_BYTES=0 SUFFIX="_seq_unsync_full"
 export SPECIAL_CFLAGS="-DWATERS_UNSYNCHRONIZED=1"
 build WATERS_DEMO $SUFFIX
 unset SPECIAL_CFLAGS
+
+# special generated waters 2015
+export PARTITION_INPUT=0
+export IGNORE_INTERNAL_STATE=1
+export IGNORE_INTERRUPTS=0 IGNORE_BYTES=0 SUFFIX="_par_bytes"
+export EXTRA_MAKE_ARGS="SEED=1"
+export EXTRA_NAME_SUFFIX="1"
+build WATERSGEN_DEMO $SUFFIX
+unset EXTRA_MAKE_ARGS
+unset EXTRA_NAME_SUFFIX