diff --git a/test/4_Lulesh/demo.sh b/test/4_Lulesh/demo.sh
index a422e23384a4904f9bdfb84d332ee9ec3d7c5aad..d55467df7091411a0d220266f4e53d4ad82fd136 100755
--- a/test/4_Lulesh/demo.sh
+++ b/test/4_Lulesh/demo.sh
@@ -1,9 +1,15 @@
+mkdir build
+cd build
+cmake -DUSE_MPI=0 -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ..
+cp compile_commands.json ../compile_commands.json
+cd ..
+
 # this is the cgcollector from metacg
-cgcollector -p build --metacg-format-version=2 lulesh.cc
-cgcollector -p build --metacg-format-version=2 lulesh-init.cc
-cgcollector -p build --metacg-format-version=2 lulesh-comm.cc
-cgcollector -p build --metacg-format-version=2 lulesh-util.cc
-cgcollector -p build --metacg-format-version=2 lulesh-viz.cc
+cgcollector -p build --extra-arg=-I$(clang -print-resource-dir)/include --metacg-format-version=2 lulesh.cc
+cgcollector -p build --extra-arg=-I$(clang -print-resource-dir)/include --metacg-format-version=2 lulesh-init.cc
+cgcollector -p build --extra-arg=-I$(clang -print-resource-dir)/include --metacg-format-version=2 lulesh-comm.cc
+cgcollector -p build --extra-arg=-I$(clang -print-resource-dir)/include --metacg-format-version=2 lulesh-util.cc
+cgcollector -p build --extra-arg=-I$(clang -print-resource-dir)/include --metacg-format-version=2 lulesh-viz.cc
 
 echo "null" > merged.ipcg
 #this is cgmerge from metacg
@@ -13,15 +19,7 @@ cgmerge merged.ipcg *.ipcg
 # as it is buggy in the current metacg release
 sed -i 's/fileProperties/FileProperties/g' merged.ipcg
 
-#this currently uses hardcoded include directories as to be compatible with C++
-#this is a terrible solution and is currently being worked on
-#CTUApex --extra-arg=-I/home/groups/da_sc/moduletree/packages-2023-08-24/.gcc/11.2.0/clang/15.0.7.debug/include \
-#--extra-arg=-I/opt/rh/gcc-toolset-12/root/usr/lib/gcc/x86_64-redhat-linux/12/../../../../include/c++/12 \
-#--extra-arg=-I/opt/rh/gcc-toolset-12/root/usr/lib/gcc/x86_64-redhat-linux/12/../../../../include/c++/12/x86_64-redhat-linux \
-#--extra-arg=-I/opt/rh/gcc-toolset-12/root/usr/lib/gcc/x86_64-redhat-linux/12/../../../../include/c++/12/backward \
-#--extra-arg=-I/work/groups/da_sc/moduletree/packages-2023-08-24/.gcc/8.5.0/clang/debug.15.0.7/lib/clang/15.0.7/include \
-#--extra-arg=-I/usr/local/include \
-#--extra-arg=-I/usr/include \
+
 CTUApex \
 --cg-file=merged.ipcg \
 --extra-arg=-DUSE_MPI=0 \
@@ -29,4 +27,4 @@ CTUApex \
 lulesh.cc lulesh-init.cc lulesh-comm.cc lulesh-util.cc lulesh-viz.cc 2> log.log
 #This should result in 5 files with the names lulesh.mini.cc lulesh-init.mini.cc lulesh-comm.mini.cc lulesh-util.mini.cc lulesh-viz.mini.cc
 #which should then be able to be compiled
-#The resulting binary is currently not able to be run, as no wrapper script can be generated the does the memory setup
\ No newline at end of file
+#The resulting binary is currently not able to be run, as no wrapper script can be generated the does the memory setup