diff --git a/.gitignore b/.gitignore
index 02b30e6..daab8c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,13 +58,10 @@ dkms.conf
 todo.txt
 
 # Build directories and executables
-GCC-*/
-ICC-*/
-ICX-*/
-CLANG-*/
-NVCC-*/
-MDBench-GCC*
-MDBench-ICC*
-MDBench-ICX*
-MDBench-CLANG*
-MDBench-NVCC*
+#GCC-*/
+#ICC-*/
+#ICX-*/
+#CLANG-*/
+#NVCC-*/
+build-*/
+MDBench-*
diff --git a/include_ICX.mk b/include_ICX.mk
index 94b3cc8..b5ef48e 100644
--- a/include_ICX.mk
+++ b/include_ICX.mk
@@ -3,15 +3,28 @@ LINKER = $(CC)
 
 OPENMP  = #-qopenmp
 PROFILE  = #-profile-functions -g  -pg
+
+ifeq ($(ISA),AVX512)
 OPTS      = -Ofast -xCORE-AVX512 -qopt-zmm-usage=high $(PROFILE)
 #OPTS      = -Ofast -march=cascadelake -xCORE-AVX512 -qopt-zmm-usage=high $(PROFILE)
-#OPTS     = -Ofast -xCORE-AVX2  $(PROFILE)
-#OPTS     = -Ofast -xAVX  $(PROFILE)
+endif
+
+ifeq ($(ISA),AVX2)
+OPTS     = -Ofast -xCORE-AVX2  $(PROFILE)
 #OPTS     = -Ofast -xAVX2  $(PROFILE)
-#OPTS     = -Ofast -xSSE4.2 $(PROFILE)
+#OPTS     = -Ofast -march=core-avx2 $(PROFILE)
+endif
+
+ifeq ($(ISA),AVX)
+OPTS     = -Ofast -xAVX  $(PROFILE)
+endif
+
+ifeq ($(ISA),SSE)
+OPTS     = -Ofast -xSSE4.2 $(PROFILE)
+endif
+
 #OPTS     = -Ofast -no-vec $(PROFILE)
 #OPTS     = -Ofast -xHost $(PROFILE)
-#OPTS     = -Ofast -march=core-avx2 $(PROFILE)
 CFLAGS   = $(PROFILE) $(OPENMP) $(OPTS)
 ASFLAGS  = #-masm=intel
 LFLAGS   = $(PROFILE) $(OPTS) $(OPENMP)
diff --git a/util/evaluate_latency_and_cfd.sh b/util/evaluate_latency_and_cfd.sh
index 5d02093..be925e4 100644
--- a/util/evaluate_latency_and_cfd.sh
+++ b/util/evaluate_latency_and_cfd.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 # Adjustable variables
-TAG="${TAG:-ICX}"
-OPT_SCHEME="${OPT_SCHEME:-gromacs}"
+TAG="${TAG:-ICC}"
+OPT_SCHEME="${OPT_SCHEME:-lammps}"
 CORE="${CORE:-0}"
 FREQ="${FREQ:-2.4}"
 NRUNS="${NRUNS:-3}"