diff --git a/cp-runner b/cp-runner
index 365392426fe8451ecda86335b5c4f23cbc636b72..cf82a9b5a4b2de6d734657157f4d49f84176ff0b 100755
--- a/cp-runner
+++ b/cp-runner
@@ -2,4 +2,4 @@
 
 LD_LIBRARY_PATH=lib-bin \
 JAVA_OPTS="-Xmx512M -Xms512M -Xss256M" \
-scala -classpath bin/purescala/purescala-definitions_2.8.1-1.0.jar:lib/z3.jar:bin/cp/constraint-programming-plugin_2.8.1-1.0.jar:out ${@}
+scala -classpath bin/purescala/purescala-definitions_2.8.1-1.0.jar:lib/z3.jar:bin/cp/constraint-programming-plugin_2.8.1-1.0.jar:lib/scalacheck_2.8.1-1.8.jar:out ${@}
diff --git a/eval/cp/scripts/run-cp-evaluation b/eval/cp/scripts/run-cp-evaluation
index 5953844c3417c07e39bcda25b085163a360bef60..593ec4a922dabcc74727cfdd6201b22bc7b0ef3a 100755
--- a/eval/cp/scripts/run-cp-evaluation
+++ b/eval/cp/scripts/run-cp-evaluation
@@ -33,8 +33,20 @@ do
   cd ../../..
 done
 
-evalFileBase=${evalFolder}/${class}-${ts}-CAV-scalaEval
-./cp CAV scalaEval ${demoFolder}/${class}.scala || (echo "Could not compile..." && exit 1)
+evalFileBase=${evalFolder}/${class}-${ts}-CAV-axioms
+./cp CAV axioms ${demoFolder}/${class}.scala || (echo "Could not compile..." && exit 1)
+
+for (( i=${base}; i<=${limit}; i++ ))
+do
+  currentFile=${evalFileBase}-${i}
+  ./cp-runner ${class} $i | tee -a ${currentFile}
+  cd eval/cp/scripts
+  ./generate-graph ../../../${currentFile}
+  cd ../../..
+done
+
+evalFileBase=${evalFolder}/${class}-${ts}-CAV-axioms-scalaEval
+./cp CAV axioms scalaEval ${demoFolder}/${class}.scala || (echo "Could not compile..." && exit 1)
 
 for (( i=${base}; i<=${limit}; i++ ))
 do
diff --git a/lib-bin/libz3.so b/lib-bin/libz3.so
index c01493352f1cdc4295858b19903e404b313e09fa..c2a1397e7c8e435a61e37fcc77455472cee6a586 100755
Binary files a/lib-bin/libz3.so and b/lib-bin/libz3.so differ
diff --git a/lib/z3.jar b/lib/z3.jar
index 6416b0828d4ee9c354c0ad8d0cbf8b0586e36680..79435432b93a053a53ff811adc5b2b54b9cd9c74 100644
Binary files a/lib/z3.jar and b/lib/z3.jar differ