diff --git a/.github/workflows/buildAndTestRyzenAI.yml b/.github/workflows/buildAndTestRyzenAI.yml
index e470786dd6..918851e3c6 100644
--- a/.github/workflows/buildAndTestRyzenAI.yml
+++ b/.github/workflows/buildAndTestRyzenAI.yml
@@ -38,7 +38,7 @@ concurrency:
 env:
   DEBIAN_FRONTEND: noninteractive
   XILINXD_LICENSE_FILE: /opt/xilinx/Xilinx.lic
-  VITIS: /opt/Xilinx/Vitis/2023.2
+  VITIS: /opt/ryzen_ai-1.3.0/vitis_aie_essentials
   CMAKE_ARGS: |
             -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
             -DCMAKE_C_COMPILER_LAUNCHER=ccache \
@@ -97,7 +97,7 @@ jobs:
           mkdir build
           pushd build
 
-          export PATH=/opt/Xilinx/Vitis/2023.2/bin:/opt/Xilinx/Vitis/2023.2/aietools/bin:$PATH
+          export PATH=$VITIS/bin:$VITIS/aietools/bin:$PATH
           cmake .. -G Ninja \
             -DPython3_EXECUTABLE=$(which python) \
             -DLLVM_EXTERNAL_LIT=$(which lit) \
@@ -134,11 +134,11 @@ jobs:
 
           pip cache purge
           source /opt/xilinx/xrt/setup.sh
-          export PATH=/opt/Xilinx/Vitis/2023.2/bin:/opt/Xilinx/Vitis/2023.2/aietools/bin:$PATH
+          export PATH=$VITIS/bin:$VITIS/aietools/bin:$PATH
           source utils/quick_setup.sh
           # quick_setup changes directory to programming_examples, so we need to return to mlir-aie
           cd ..
-          ./utils/build-mlir-aie-from-wheels.sh ./my_install/mlir
+          ./utils/build-mlir-aie-from-wheels.sh ./my_install/mlir build install ./my_install/llvm-aie
 
           # build is created by the build-mlir-aie-from-wheels.sh script
           pushd build
diff --git a/aie_kernels/generic/passThrough.cc b/aie_kernels/generic/passThrough.cc
index 1de33066d1..ccdb5f27f2 100644
--- a/aie_kernels/generic/passThrough.cc
+++ b/aie_kernels/generic/passThrough.cc
@@ -12,7 +12,6 @@
 #define NOCPP
 
 #include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
 
 #include <aie_api/aie.hpp>
@@ -37,39 +36,33 @@ extern "C" {
 #if BIT_WIDTH == 8
 
 void passThroughLine(uint8_t *in, uint8_t *out, int32_t lineWidth) {
-  printf("passThroughLine BIT_WIDTH\n");
   passThrough_aie<uint8_t, 64>(in, out, 1, lineWidth);
 }
 
 void passThroughTile(uint8_t *in, uint8_t *out, int32_t tileHeight,
                      int32_t tileWidth) {
-  printf("passThroughTile BIT_WIDTH\n");
   passThrough_aie<uint8_t, 64>(in, out, tileHeight, tileWidth);
 }
 
 #elif BIT_WIDTH == 16
 
 void passThroughLine(int16_t *in, int16_t *out, int32_t lineWidth) {
-  printf("passThroughLine BIT_WIDTH\n");
   passThrough_aie<int16_t, 32>(in, out, 1, lineWidth);
 }
 
 void passThroughTile(int16_t *in, int16_t *out, int32_t tileHeight,
                      int32_t tileWidth) {
-  printf("passThroughTile BIT_WIDTH\n");
   passThrough_aie<int16_t, 32>(in, out, tileHeight, tileWidth);
 }
 
 #else // 32
 
 void passThroughLine(int32_t *in, int32_t *out, int32_t lineWidth) {
-  printf("passThroughLine BIT_WIDTH\n");
   passThrough_aie<int32_t, 16>(in, out, 1, lineWidth);
 }
 
 void passThroughTile(int32_t *in, int32_t *out, int32_t tileHeight,
                      int32_t tileWidth) {
-  printf("passThroughTile BIT_WIDTH\n");
   passThrough_aie<int32_t, 16>(in, out, tileHeight, tileWidth);
 }
 
diff --git a/programming_examples/basic/dma_transpose/Makefile b/programming_examples/basic/dma_transpose/Makefile
index 888e9c240c..69c1292070 100644
--- a/programming_examples/basic/dma_transpose/Makefile
+++ b/programming_examples/basic/dma_transpose/Makefile
@@ -27,6 +27,7 @@ build/aie.mlir: ${srcdir}/aie2.py
 build/final.xclbin: build/aie.mlir
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
+    			--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 				--aie-generate-npu --npu-insts-name=insts.txt $(<:%=../%)
 
 ${targetname}.exe: ${srcdir}/test.cpp
diff --git a/programming_examples/basic/dma_transpose/run_makefile.lit b/programming_examples/basic/dma_transpose/run_makefile.lit
index 6875524001..cdae3657a2 100644
--- a/programming_examples/basic/dma_transpose/run_makefile.lit
+++ b/programming_examples/basic/dma_transpose/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess
+// REQUIRES: ryzen_ai, peano 
 //
 // RUN: make -f %S/Makefile clean
 // RUN: make -f %S/Makefile 
diff --git a/programming_examples/basic/matrix_multiplication/cascade/Makefile b/programming_examples/basic/matrix_multiplication/cascade/Makefile
index ffbc860c27..2bb2540969 100644
--- a/programming_examples/basic/matrix_multiplication/cascade/Makefile
+++ b/programming_examples/basic/matrix_multiplication/cascade/Makefile
@@ -25,6 +25,8 @@ target_suffix=${M}x${K}x${N}_${m}x${k}x${n}_${n_aie_cols}c
 
 include ${srcdir}/../makefile-common
 
+CHESS=true
+
 build/mm_${m}x${k}x${n}.o: ${kernels_dir}/cascade_mm.cc
 	mkdir -p ${@D}
 	cd ${@D} && xchesscc_wrapper ${CHESSCCWRAP2_FLAGS} -DBIT_WIDTH=8 -DDIM_M=${m} -DDIM_K=${k} -DDIM_N=${n} -c $< -o ${@F}
diff --git a/programming_examples/basic/matrix_multiplication/makefile-common b/programming_examples/basic/matrix_multiplication/makefile-common
index 3d0a8ec01e..182c0d6a4c 100644
--- a/programming_examples/basic/matrix_multiplication/makefile-common
+++ b/programming_examples/basic/matrix_multiplication/makefile-common
@@ -81,6 +81,8 @@ aie_py_src?=aie2.py
 runargs?=-v 2 --warmup 1 --iters 1
 aieargs+=-M $M -K $K -N $N --dtype_in ${dtype_in} --dtype_out ${dtype_out}
 
+CHESS?=false
+
 kernels_dir=${srcdir}/../../../../aie_kernels/aie2
 
 .PHONY: all
@@ -88,7 +90,7 @@ all: ${xclbin_target} ${targetname}.exe
 
 build/%.o: ${kernels_dir}/%.cc
 	mkdir -p ${@D}
-	cd ${@D} && xchesscc_wrapper ${CHESSCCWRAP2_FLAGS} -DBIT_WIDTH=8 -c $< -o ${@F}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang++ ${PEANOWRAP2_FLAGS} -DBIT_WIDTH=8 -c $< -o ${@F}
 
 ${mlir_target}: ${srcdir}/${aie_py_src}
 	mkdir -p ${@D}
@@ -97,6 +99,9 @@ ${mlir_target}: ${srcdir}/${aie_py_src}
 ${xclbin_target}: ${mlir_target} ${kernels:%=build/%.o}
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
+				$(if $(shell [ $(CHESS) != true ] && echo true), \
+					--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR}, \
+				) \
 				--aie-generate-npu --npu-insts-name=${insts_target:build/%=%} $(<:%=../%)
 
 ${targetname}.exe: ${srcdir}/test.cpp ${srcdir}/../test.cpp ${srcdir}/../common.h
diff --git a/programming_examples/basic/matrix_multiplication/matrix_vector/Makefile b/programming_examples/basic/matrix_multiplication/matrix_vector/Makefile
index 0b88616bae..7397be0501 100644
--- a/programming_examples/basic/matrix_multiplication/matrix_vector/Makefile
+++ b/programming_examples/basic/matrix_multiplication/matrix_vector/Makefile
@@ -26,5 +26,5 @@ include ${SELF_DIR}../makefile-common
 
 build/mv_${m}x${k}.o: ${kernels_dir}/mv.cc
 	mkdir -p ${@D}
-	cd ${@D} && xchesscc_wrapper ${CHESSCCWRAP2_FLAGS} -DBIT_WIDTH=8 -DDIM_M=${m} -DDIM_K=${k} -c $< -o ${@F}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang++ ${PEANOWRAP2_FLAGS} -DBIT_WIDTH=8 -DDIM_M=${m} -DDIM_K=${k} -c $< -o ${@F}
 
diff --git a/programming_examples/basic/matrix_multiplication/matrix_vector/Makefile.chess b/programming_examples/basic/matrix_multiplication/matrix_vector/Makefile.chess
new file mode 100644
index 0000000000..0a999fb365
--- /dev/null
+++ b/programming_examples/basic/matrix_multiplication/matrix_vector/Makefile.chess
@@ -0,0 +1,32 @@
+##===- Makefile -----------------------------------------------------------===##
+# 
+# This file licensed under the Apache License v2.0 with LLVM Exceptions.
+# See https://llvm.org/LICENSE.txt for license information.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+# 
+# Copyright (C) 2024, Advanced Micro Devices, Inc.
+# 
+##===----------------------------------------------------------------------===##
+
+subdir=matrix_vector
+targetname=matrixVectorMultiplication
+
+# Currently does not accept reconfiguring size via these variables; must change
+# in source at aie2.py as well as here
+M=288
+K=288
+N=1
+m=32
+k=32
+
+kernels=mv_${m}x${k}
+
+SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
+include ${SELF_DIR}../makefile-common
+
+CHESS=true
+
+build/mv_${m}x${k}.o: ${kernels_dir}/mv.cc
+	mkdir -p ${@D}
+	cd ${@D} && xchesscc_wrapper ${CHESSCCWRAP2_FLAGS} -DBIT_WIDTH=8 -DDIM_M=${m} -DDIM_K=${k} -c $< -o ${@F}
+
diff --git a/programming_examples/basic/matrix_multiplication/matrix_vector/run_makefile.lit b/programming_examples/basic/matrix_multiplication/matrix_vector/run_makefile.lit
index 6875524001..cdae3657a2 100644
--- a/programming_examples/basic/matrix_multiplication/matrix_vector/run_makefile.lit
+++ b/programming_examples/basic/matrix_multiplication/matrix_vector/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess
+// REQUIRES: ryzen_ai, peano 
 //
 // RUN: make -f %S/Makefile clean
 // RUN: make -f %S/Makefile 
diff --git a/programming_examples/basic/matrix_multiplication/matrix_vector/run_makefile_chess.lit b/programming_examples/basic/matrix_multiplication/matrix_vector/run_makefile_chess.lit
new file mode 100644
index 0000000000..1e6a64cf1f
--- /dev/null
+++ b/programming_examples/basic/matrix_multiplication/matrix_vector/run_makefile_chess.lit
@@ -0,0 +1,9 @@
+// (c) Copyright 2024 Advanced Micro Devices, Inc.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+// REQUIRES: ryzen_ai, chess 
+//
+// RUN: make -f %S/Makefile.chess clean
+// RUN: make -f %S/Makefile.chess
+// RUN: %run_on_npu make -f %S/Makefile.chess run | FileCheck %s
+// CHECK: PASS!
diff --git a/programming_examples/basic/matrix_multiplication/single_core/Makefile b/programming_examples/basic/matrix_multiplication/single_core/Makefile
index a04e7f67bf..587d057e05 100644
--- a/programming_examples/basic/matrix_multiplication/single_core/Makefile
+++ b/programming_examples/basic/matrix_multiplication/single_core/Makefile
@@ -33,5 +33,5 @@ include ${srcdir}/../makefile-common
 
 build/mm_${m}x${k}x${n}.o: ${kernels_dir}/mm.cc
 	mkdir -p ${@D}
-	cd ${@D} && xchesscc_wrapper ${CHESSCCWRAP2_FLAGS} -DBIT_WIDTH=8 -D${dtype_in}_${dtype_out}_ONLY -DDIM_M=${m} -DDIM_K=${k} -DDIM_N=${n} -c $< -o ${@F}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang++ ${PEANOWRAP2_FLAGS} -DBIT_WIDTH=8 -D${dtype_in}_${dtype_out}_ONLY -DDIM_M=${m} -DDIM_K=${k} -DDIM_N=${n} -c $< -o ${@F}
 
diff --git a/programming_examples/basic/matrix_multiplication/single_core/Makefile.chess b/programming_examples/basic/matrix_multiplication/single_core/Makefile.chess
new file mode 100644
index 0000000000..229fb6eabc
--- /dev/null
+++ b/programming_examples/basic/matrix_multiplication/single_core/Makefile.chess
@@ -0,0 +1,39 @@
+##===- Makefile -----------------------------------------------------------===##
+# 
+# This file licensed under the Apache License v2.0 with LLVM Exceptions.
+# See https://llvm.org/LICENSE.txt for license information.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+#
+# Copyright (C) 2024, Advanced Micro Devices, Inc.
+# 
+##===----------------------------------------------------------------------===##
+
+srcdir := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
+subdir=single_core
+targetname=matrixMultiplication
+kernels=mm
+
+M?=256
+K?=256
+N?=256
+m?=64
+k?=64
+n?=32
+
+kernels=mm_${m}x${k}x${n}
+aieargs+=-m $m -k $k -n $n
+target_suffix=${M}x${K}x${N}_${m}x${k}x${n}
+use_alt?=0
+
+ifeq (${use_alt}, 1)
+aie_py_src=aie2_alt.py
+endif
+
+include ${srcdir}/../makefile-common
+
+CHESS=true
+
+build/mm_${m}x${k}x${n}.o: ${kernels_dir}/mm.cc
+	mkdir -p ${@D}
+	cd ${@D} && xchesscc_wrapper ${CHESSCCWRAP2_FLAGS} -DBIT_WIDTH=8 -D${dtype_in}_${dtype_out}_ONLY -DDIM_M=${m} -DDIM_K=${k} -DDIM_N=${n} -c $< -o ${@F}
+
diff --git a/programming_examples/basic/matrix_multiplication/single_core/run_makefile.lit b/programming_examples/basic/matrix_multiplication/single_core/run_makefile.lit
index f5014c39d3..00e62e1362 100644
--- a/programming_examples/basic/matrix_multiplication/single_core/run_makefile.lit
+++ b/programming_examples/basic/matrix_multiplication/single_core/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess
+// REQUIRES: ryzen_ai, peano 
 //
 // RUN: mkdir -p %S/test_1
 // RUN: cd %S/test_1
diff --git a/programming_examples/basic/matrix_multiplication/single_core/run_makefile_1.lit b/programming_examples/basic/matrix_multiplication/single_core/run_makefile_1.lit
index 6b198065c1..76e86dad05 100644
--- a/programming_examples/basic/matrix_multiplication/single_core/run_makefile_1.lit
+++ b/programming_examples/basic/matrix_multiplication/single_core/run_makefile_1.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess
+// REQUIRES: ryzen_ai, peano 
 //
 // RUN: mkdir -p %S/test_2
 // RUN: cd %S/test_2
diff --git a/programming_examples/basic/matrix_multiplication/single_core/run_makefile_alt.lit b/programming_examples/basic/matrix_multiplication/single_core/run_makefile_alt.lit
index 7c11ec3de3..c5a0ff383d 100644
--- a/programming_examples/basic/matrix_multiplication/single_core/run_makefile_alt.lit
+++ b/programming_examples/basic/matrix_multiplication/single_core/run_makefile_alt.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess
+// REQUIRES: ryzen_ai, peano 
 //
 // RUN: mkdir -p %S/test_alt
 // RUN: cd %S/test_alt
diff --git a/programming_examples/basic/matrix_multiplication/single_core/run_makefile_chess.lit b/programming_examples/basic/matrix_multiplication/single_core/run_makefile_chess.lit
new file mode 100644
index 0000000000..1e6a64cf1f
--- /dev/null
+++ b/programming_examples/basic/matrix_multiplication/single_core/run_makefile_chess.lit
@@ -0,0 +1,9 @@
+// (c) Copyright 2024 Advanced Micro Devices, Inc.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+// REQUIRES: ryzen_ai, chess 
+//
+// RUN: make -f %S/Makefile.chess clean
+// RUN: make -f %S/Makefile.chess
+// RUN: %run_on_npu make -f %S/Makefile.chess run | FileCheck %s
+// CHECK: PASS!
diff --git a/programming_examples/basic/matrix_multiplication/single_core/run_makefile_i8.lit b/programming_examples/basic/matrix_multiplication/single_core/run_makefile_i8.lit
index 77e318dbc0..cc457ddb59 100644
--- a/programming_examples/basic/matrix_multiplication/single_core/run_makefile_i8.lit
+++ b/programming_examples/basic/matrix_multiplication/single_core/run_makefile_i8.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess
+// REQUIRES: ryzen_ai, peano 
 //
 // RUN: mkdir -p %S/test_i8
 // RUN: cd %S/test_i8
diff --git a/programming_examples/basic/matrix_multiplication/whole_array/Makefile b/programming_examples/basic/matrix_multiplication/whole_array/Makefile
index 1a70838cd4..3aa1a0283e 100644
--- a/programming_examples/basic/matrix_multiplication/whole_array/Makefile
+++ b/programming_examples/basic/matrix_multiplication/whole_array/Makefile
@@ -29,11 +29,11 @@ include ${srcdir}/../makefile-common
 
 build/mm_b_row_maj_${m}x${k}x${n}.o: ${kernels_dir}/mm.cc
 	mkdir -p ${@D}
-	cd ${@D} && xchesscc_wrapper ${CHESSCCWRAP2_FLAGS} -DBIT_WIDTH=8 -D${dtype_in}_${dtype_out}_ONLY -DDIM_M=${m} -DDIM_K=${k} -DDIM_N=${n} -c $< -o ${@F}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang++ ${PEANOWRAP2_FLAGS} -DBIT_WIDTH=8 -D${dtype_in}_${dtype_out}_ONLY -DDIM_M=${m} -DDIM_K=${k} -DDIM_N=${n} -c $< -o ${@F}
 
 build/mm_b_col_maj_${m}x${k}x${n}.o: ${kernels_dir}/mm_b_col_maj.cc
 	mkdir -p ${@D}
-	cd ${@D} && xchesscc_wrapper ${CHESSCCWRAP2_FLAGS} -DBIT_WIDTH=8 -DDIM_M=${m} -DDIM_K=${k} -DDIM_N=${n} -c $< -o ${@F}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang++ ${PEANOWRAP2_FLAGS} -DBIT_WIDTH=8 -DDIM_M=${m} -DDIM_K=${k} -DDIM_N=${n} -c $< -o ${@F}
 
 ifneq (${b_col_maj}, 1)
 build/mm_${m}x${k}x${n}.o: build/mm_b_row_maj_${m}x${k}x${n}.o 
diff --git a/programming_examples/basic/matrix_multiplication/whole_array/Makefile.chess b/programming_examples/basic/matrix_multiplication/whole_array/Makefile.chess
new file mode 100644
index 0000000000..df8178d460
--- /dev/null
+++ b/programming_examples/basic/matrix_multiplication/whole_array/Makefile.chess
@@ -0,0 +1,48 @@
+##===- Makefile -----------------------------------------------------------===##
+# 
+# This file licensed under the Apache License v2.0 with LLVM Exceptions.
+# See https://llvm.org/LICENSE.txt for license information.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+#
+# Copyright (C) 2024, Advanced Micro Devices, Inc.
+# 
+##===----------------------------------------------------------------------===##
+srcdir := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
+subdir=whole_array
+targetname=matrixMultiplication
+
+M?=640
+K?=896
+N?=768
+m?=16
+k?=32
+n?=48
+n_aie_cols?=2
+b_col_maj?=0
+
+kernels=mm_${m}x${k}x${n}
+aieargs+=-m $m -k $k -n $n --n-aie-cols ${n_aie_cols} --b-col-maj ${b_col_maj}
+runargs+=--b_col_maj ${b_col_maj}
+target_suffix=${M}x${K}x${N}_${m}x${k}x${n}_${n_aie_cols}c
+
+include ${srcdir}/../makefile-common
+
+CHESS=true
+
+build/mm_b_row_maj_${m}x${k}x${n}.o: ${kernels_dir}/mm.cc
+	mkdir -p ${@D}
+	cd ${@D} && xchesscc_wrapper ${CHESSCCWRAP2_FLAGS} -DBIT_WIDTH=8 -D${dtype_in}_${dtype_out}_ONLY -DDIM_M=${m} -DDIM_K=${k} -DDIM_N=${n} -c $< -o ${@F}
+
+build/mm_b_col_maj_${m}x${k}x${n}.o: ${kernels_dir}/mm_b_col_maj.cc
+	mkdir -p ${@D}
+	cd ${@D} && xchesscc_wrapper ${CHESSCCWRAP2_FLAGS} -DBIT_WIDTH=8 -DDIM_M=${m} -DDIM_K=${k} -DDIM_N=${n} -c $< -o ${@F}
+
+ifneq (${b_col_maj}, 1)
+build/mm_${m}x${k}x${n}.o: build/mm_b_row_maj_${m}x${k}x${n}.o 
+	mkdir -p ${@D}
+	ar rvs $@ $^
+else
+build/mm_${m}x${k}x${n}.o: build/mm_b_col_maj_${m}x${k}x${n}.o
+	mkdir -p ${@D}
+	ar rvs $@ $^
+endif
diff --git a/programming_examples/basic/matrix_multiplication/whole_array/run_makefile_1_col.lit b/programming_examples/basic/matrix_multiplication/whole_array/run_makefile_1_col.lit
index 9234eb1e67..db6bbcce1a 100644
--- a/programming_examples/basic/matrix_multiplication/whole_array/run_makefile_1_col.lit
+++ b/programming_examples/basic/matrix_multiplication/whole_array/run_makefile_1_col.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess
+// REQUIRES: ryzen_ai, peano 
 //
 // RUN: mkdir -p %S/test_1_col
 // RUN: cd %S/test_1_col
diff --git a/programming_examples/basic/matrix_multiplication/whole_array/run_makefile_2_col.lit b/programming_examples/basic/matrix_multiplication/whole_array/run_makefile_2_col.lit
index 859d669d0d..7bfcfffa15 100644
--- a/programming_examples/basic/matrix_multiplication/whole_array/run_makefile_2_col.lit
+++ b/programming_examples/basic/matrix_multiplication/whole_array/run_makefile_2_col.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess
+// REQUIRES: ryzen_ai, peano 
 //
 // RUN: mkdir -p %S/test_2_col
 // RUN: cd %S/test_2_col
diff --git a/programming_examples/basic/matrix_multiplication/whole_array/run_makefile_4_col.lit b/programming_examples/basic/matrix_multiplication/whole_array/run_makefile_4_col.lit
index 170a68df0e..b101683158 100644
--- a/programming_examples/basic/matrix_multiplication/whole_array/run_makefile_4_col.lit
+++ b/programming_examples/basic/matrix_multiplication/whole_array/run_makefile_4_col.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess
+// REQUIRES: ryzen_ai, peano 
 //
 // RUN: mkdir -p %S/test_4_col
 // RUN: cd %S/test_4_col
diff --git a/programming_examples/basic/matrix_multiplication/whole_array/run_makefile_4_col_i8.lit b/programming_examples/basic/matrix_multiplication/whole_array/run_makefile_4_col_i8.lit
index c9007d1065..011bc05005 100644
--- a/programming_examples/basic/matrix_multiplication/whole_array/run_makefile_4_col_i8.lit
+++ b/programming_examples/basic/matrix_multiplication/whole_array/run_makefile_4_col_i8.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess
+// REQUIRES: ryzen_ai, peano 
 //
 // RUN: mkdir -p %S/test_4_col_i8
 // RUN: cd %S/test_4_col_i8
diff --git a/programming_examples/basic/matrix_multiplication/whole_array/run_makefile_chess.lit b/programming_examples/basic/matrix_multiplication/whole_array/run_makefile_chess.lit
new file mode 100644
index 0000000000..1e6a64cf1f
--- /dev/null
+++ b/programming_examples/basic/matrix_multiplication/whole_array/run_makefile_chess.lit
@@ -0,0 +1,9 @@
+// (c) Copyright 2024 Advanced Micro Devices, Inc.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+// REQUIRES: ryzen_ai, chess 
+//
+// RUN: make -f %S/Makefile.chess clean
+// RUN: make -f %S/Makefile.chess
+// RUN: %run_on_npu make -f %S/Makefile.chess run | FileCheck %s
+// CHECK: PASS!
diff --git a/programming_examples/basic/matrix_multiplication/whole_array/run_makefile_col_maj.lit b/programming_examples/basic/matrix_multiplication/whole_array/run_makefile_col_maj.lit
index b4503c39bc..5bfdf7bdfe 100644
--- a/programming_examples/basic/matrix_multiplication/whole_array/run_makefile_col_maj.lit
+++ b/programming_examples/basic/matrix_multiplication/whole_array/run_makefile_col_maj.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess
+// REQUIRES: ryzen_ai, peano 
 //
 // RUN: mkdir -p %S/test_b_col_maj
 // RUN: cd %S/test_b_col_maj
diff --git a/programming_examples/basic/matrix_scalar_add/Makefile b/programming_examples/basic/matrix_scalar_add/Makefile
index 35b3d0df0c..5a35e9b3d5 100644
--- a/programming_examples/basic/matrix_scalar_add/Makefile
+++ b/programming_examples/basic/matrix_scalar_add/Makefile
@@ -23,6 +23,7 @@ all: build/final.xclbin
 build/final.xclbin: build/aie.mlir
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
+    	--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 		--xclbin-name=${@F} --npu-insts-name=insts.txt ${<F}
 
 ${targetname}.exe: ${srcdir}/test.cpp
diff --git a/programming_examples/basic/matrix_scalar_add/run_makefile.lit b/programming_examples/basic/matrix_scalar_add/run_makefile.lit
index 6875524001..cdae3657a2 100644
--- a/programming_examples/basic/matrix_scalar_add/run_makefile.lit
+++ b/programming_examples/basic/matrix_scalar_add/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess
+// REQUIRES: ryzen_ai, peano 
 //
 // RUN: make -f %S/Makefile clean
 // RUN: make -f %S/Makefile 
diff --git a/programming_examples/basic/passthrough_dmas/Makefile b/programming_examples/basic/passthrough_dmas/Makefile
index 6b901d59c5..deaa4cec00 100644
--- a/programming_examples/basic/passthrough_dmas/Makefile
+++ b/programming_examples/basic/passthrough_dmas/Makefile
@@ -33,6 +33,7 @@ inst/insts.txt: ${srcdir}/aie2.py
 build/final.xclbin: build/aie.mlir
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
+    			--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 				--aie-generate-npu --npu-insts-name=insts.txt $(<:%=../%)
 
 ${targetname}.exe: ${srcdir}/test.cpp
diff --git a/programming_examples/basic/passthrough_dmas/run_makefile.lit b/programming_examples/basic/passthrough_dmas/run_makefile.lit
index 6875524001..cdae3657a2 100644
--- a/programming_examples/basic/passthrough_dmas/run_makefile.lit
+++ b/programming_examples/basic/passthrough_dmas/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess
+// REQUIRES: ryzen_ai, peano 
 //
 // RUN: make -f %S/Makefile clean
 // RUN: make -f %S/Makefile 
diff --git a/programming_examples/basic/passthrough_kernel/Makefile b/programming_examples/basic/passthrough_kernel/Makefile
index 11f2824a42..847a747e2f 100644
--- a/programming_examples/basic/passthrough_kernel/Makefile
+++ b/programming_examples/basic/passthrough_kernel/Makefile
@@ -32,16 +32,18 @@ build/aie_trace__lineBased_8b_${data_size}.mlir: ${srcdir}/aie2.py
 
 build/passThrough.cc.o: passThrough.cc
 	mkdir -p ${@D}
-	cd ${@D} && xchesscc_wrapper ${CHESSCCWRAP2_FLAGS} -DBIT_WIDTH=8 -c $< -o ${@F}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang++ ${PEANOWRAP2_FLAGS} -DBIT_WIDTH=8 -c $< -o ${@F}
 	
 build/final_${data_size}.xclbin: build/aie2_lineBased_8b_${data_size}.mlir build/passThrough.cc.o
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
+    	--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 		--xclbin-name=${@F} --npu-insts-name=insts_${data_size}.txt $(<:%=../%)
 
 build/final_trace_${data_size}.xclbin: build/aie2_lineBased_8b_${data_size}.mlir build/passThrough.cc.o
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
+    	--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 		--xclbin-name=${@F} --npu-insts-name=insts_${data_size}.txt $(<:%=../%)
 
 ${targetname}_${data_size}.exe: ${srcdir}/test.cpp
diff --git a/programming_examples/basic/passthrough_kernel/run_makefile.lit b/programming_examples/basic/passthrough_kernel/run_makefile.lit
index 1c069c00b3..e8213c5d18 100644
--- a/programming_examples/basic/passthrough_kernel/run_makefile.lit
+++ b/programming_examples/basic/passthrough_kernel/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess
+// REQUIRES: ryzen_ai, peano 
 //
 // RUN: make -f %S/Makefile clean
 // RUN: make -f %S/Makefile 
diff --git a/programming_examples/basic/passthrough_pykernel/Makefile b/programming_examples/basic/passthrough_pykernel/Makefile
index 956cad5906..2a21fba8cf 100644
--- a/programming_examples/basic/passthrough_pykernel/Makefile
+++ b/programming_examples/basic/passthrough_pykernel/Makefile
@@ -28,6 +28,7 @@ build/aie.mlir: ${srcdir}/aie2.py
 build/final_${data_size}.xclbin: build/aie.mlir
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
+    	--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 		--xclbin-name=${@F} --npu-insts-name=insts_${data_size}.txt $(<:%=../%)
 
 ${targetname}_${data_size}.exe: ${srcdir}/test.cpp
diff --git a/programming_examples/basic/passthrough_pykernel/run_makefile.lit b/programming_examples/basic/passthrough_pykernel/run_makefile.lit
index 1c069c00b3..e8213c5d18 100644
--- a/programming_examples/basic/passthrough_pykernel/run_makefile.lit
+++ b/programming_examples/basic/passthrough_pykernel/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess
+// REQUIRES: ryzen_ai, peano 
 //
 // RUN: make -f %S/Makefile clean
 // RUN: make -f %S/Makefile 
diff --git a/programming_examples/basic/row_wise_bias_add/Makefile b/programming_examples/basic/row_wise_bias_add/Makefile
index 6e404a9323..165d75880b 100644
--- a/programming_examples/basic/row_wise_bias_add/Makefile
+++ b/programming_examples/basic/row_wise_bias_add/Makefile
@@ -8,21 +8,21 @@
 # 
 ##===----------------------------------------------------------------------===##
 
+srcdir := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include ${srcdir}/../../makefile-common
+
 # ---
 
 # The following environment variables that point to the Xilinx runtime (XRT)
 # should be set up by an environment setup script already.
 XILINX_XRT?=/opt/xilinx/xrt
-XILINX_VITIS?=$(shell realpath $(dir $(shell which vitis))/../)
 
 # ---
 
-srcdir := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
-
 XILINX_XRT_INCLUDE?=${XILINX_XRT}/include
 XILINX_XRT_LIB?=${XILINX_XRT}/lib
 
-CHESSCCWRAP2_FLAGS=aie2 -I${XILINX_VITIS}/aietools/include 
 XRT_FLAGS=-I${XILINX_XRT_INCLUDE} -L${XILINX_XRT_LIB}
 XRT_LIBS=-lxrt_coreutil
 CXX=g++-13 -ggdb 
@@ -42,7 +42,7 @@ all: ${xclbin_target} ${host_target}
 
 build/kernel.o: ${srcdir}/kernel.cc
 	mkdir -p ${@D}
-	cd ${@D} && xchesscc_wrapper ${CHESSCCWRAP2_FLAGS} -DDIM_m=$m -DDIM_n=$n -c $< -o ${@F}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang++ ${PEANOWRAP2_FLAGS} -DDIM_m=$m -DDIM_n=$n -c $< -o ${@F}
 
 ${mlir_target}: ${srcdir}/aie2.py
 	mkdir -p ${@D}
@@ -51,6 +51,7 @@ ${mlir_target}: ${srcdir}/aie2.py
 ${xclbin_target}: ${mlir_target} build/kernel.o
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py -v --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
+    			--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 				--aie-generate-npu --npu-insts-name=${insts_target:build/%=%} ${<:%=../%}
 
 ${host_target}: ${srcdir}/test.cpp ${xclbin_target}
diff --git a/programming_examples/basic/row_wise_bias_add/run_makefile.lit b/programming_examples/basic/row_wise_bias_add/run_makefile.lit
index 6875524001..cdae3657a2 100644
--- a/programming_examples/basic/row_wise_bias_add/run_makefile.lit
+++ b/programming_examples/basic/row_wise_bias_add/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess
+// REQUIRES: ryzen_ai, peano 
 //
 // RUN: make -f %S/Makefile clean
 // RUN: make -f %S/Makefile 
diff --git a/programming_examples/basic/vector_exp/Makefile b/programming_examples/basic/vector_exp/Makefile
index a468a4dc06..b0770b13b9 100644
--- a/programming_examples/basic/vector_exp/Makefile
+++ b/programming_examples/basic/vector_exp/Makefile
@@ -20,11 +20,11 @@ VPATH := ${srcdir}/../../../aie_kernels/aie2
 
 build/exp.o: bf16_exp.cc
 	mkdir -p ${@D}
-	cd ${@D} && xchesscc_wrapper ${CHESSCCWRAP2_FLAGS} -I../../../../aie_runtime_lib/AIE2 -c $< -o ${@F}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang++ ${PEANOWRAP2_FLAGS} -I../../../../aie_runtime_lib/AIE2 -c $< -o ${@F}
 
 build/lut_based_ops.o: ${srcdir}/../../../aie_runtime_lib/AIE2/lut_based_ops.cpp
 	mkdir -p ${@D}
-	cd ${@D} && xchesscc_wrapper ${CHESSCCWRAP2_FLAGS} -I. -c $< -o ${@F}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang++ ${PEANOWRAP2_FLAGS} -I. -c $< -o ${@F}
 
 build/kernels.a: build/exp.o build/lut_based_ops.o
 	ar rvs $@ $+
@@ -36,6 +36,7 @@ build/aie.mlir: ${srcdir}/aie2.py
 build/final.xclbin: build/aie.mlir build/kernels.a
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
+    			--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 				--aie-generate-npu --npu-insts-name=insts.txt $(<:%=../%)
 
 ${targetname}.exe: ${srcdir}/test.cpp
diff --git a/programming_examples/basic/vector_exp/run_makefile.lit b/programming_examples/basic/vector_exp/run_makefile.lit
index 6875524001..cdae3657a2 100644
--- a/programming_examples/basic/vector_exp/run_makefile.lit
+++ b/programming_examples/basic/vector_exp/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess
+// REQUIRES: ryzen_ai, peano 
 //
 // RUN: make -f %S/Makefile clean
 // RUN: make -f %S/Makefile 
diff --git a/programming_examples/basic/vector_reduce_add/run_makefile.lit b/programming_examples/basic/vector_reduce_add/run_makefile.lit
index 6875524001..3f16fc9ca6 100644
--- a/programming_examples/basic/vector_reduce_add/run_makefile.lit
+++ b/programming_examples/basic/vector_reduce_add/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess
+// REQUIRES: ryzen_ai, chess 
 //
 // RUN: make -f %S/Makefile clean
 // RUN: make -f %S/Makefile 
diff --git a/programming_examples/basic/vector_reduce_max/run_makefile.lit b/programming_examples/basic/vector_reduce_max/run_makefile.lit
index 6875524001..3f16fc9ca6 100644
--- a/programming_examples/basic/vector_reduce_max/run_makefile.lit
+++ b/programming_examples/basic/vector_reduce_max/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess
+// REQUIRES: ryzen_ai, chess 
 //
 // RUN: make -f %S/Makefile clean
 // RUN: make -f %S/Makefile 
diff --git a/programming_examples/basic/vector_reduce_min/run_makefile.lit b/programming_examples/basic/vector_reduce_min/run_makefile.lit
index 6875524001..3f16fc9ca6 100644
--- a/programming_examples/basic/vector_reduce_min/run_makefile.lit
+++ b/programming_examples/basic/vector_reduce_min/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess
+// REQUIRES: ryzen_ai, chess 
 //
 // RUN: make -f %S/Makefile clean
 // RUN: make -f %S/Makefile 
diff --git a/programming_examples/basic/vector_scalar_add/Makefile b/programming_examples/basic/vector_scalar_add/Makefile
index d6c0e29738..dea6aa9586 100644
--- a/programming_examples/basic/vector_scalar_add/Makefile
+++ b/programming_examples/basic/vector_scalar_add/Makefile
@@ -23,6 +23,7 @@ build/aie.mlir: ${srcdir}/aie2.py
 build/final.xclbin: build/aie.mlir
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
+    	--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 		--xclbin-name=${@F} --npu-insts-name=insts.txt ${<F}
 
 ${targetname}.exe: ${srcdir}/test.cpp
diff --git a/programming_examples/basic/vector_scalar_add/run_makefile.lit b/programming_examples/basic/vector_scalar_add/run_makefile.lit
index 6875524001..cdae3657a2 100644
--- a/programming_examples/basic/vector_scalar_add/run_makefile.lit
+++ b/programming_examples/basic/vector_scalar_add/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess
+// REQUIRES: ryzen_ai, peano 
 //
 // RUN: make -f %S/Makefile clean
 // RUN: make -f %S/Makefile 
diff --git a/programming_examples/basic/vector_scalar_add_runlist/Makefile b/programming_examples/basic/vector_scalar_add_runlist/Makefile
index d6c0e29738..dea6aa9586 100644
--- a/programming_examples/basic/vector_scalar_add_runlist/Makefile
+++ b/programming_examples/basic/vector_scalar_add_runlist/Makefile
@@ -23,6 +23,7 @@ build/aie.mlir: ${srcdir}/aie2.py
 build/final.xclbin: build/aie.mlir
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
+    	--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 		--xclbin-name=${@F} --npu-insts-name=insts.txt ${<F}
 
 ${targetname}.exe: ${srcdir}/test.cpp
diff --git a/programming_examples/basic/vector_scalar_add_runlist/run_makefile.lit b/programming_examples/basic/vector_scalar_add_runlist/run_makefile.lit
index 6875524001..de53923059 100644
--- a/programming_examples/basic/vector_scalar_add_runlist/run_makefile.lit
+++ b/programming_examples/basic/vector_scalar_add_runlist/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess
+// REQUIRES: ryzen_ai, peano
 //
 // RUN: make -f %S/Makefile clean
 // RUN: make -f %S/Makefile 
diff --git a/programming_examples/basic/vector_scalar_mul/Makefile b/programming_examples/basic/vector_scalar_mul/Makefile
index e969be08f3..9d2149babc 100644
--- a/programming_examples/basic/vector_scalar_mul/Makefile
+++ b/programming_examples/basic/vector_scalar_mul/Makefile
@@ -24,7 +24,7 @@ kristof: build/insts_${data_size}.txt
 
 build/%.o: %.cc
 	mkdir -p ${@D}
-	cd ${@D} && xchesscc_wrapper ${CHESSCCWRAP2_FLAGS} -c $< -o ${@F}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang++ ${PEANOWRAP2_FLAGS} -c $< -o ${@F}
 
 build/aie_${data_size}.mlir: ${srcdir}/aie2.py
 	mkdir -p ${@D}
@@ -38,11 +38,13 @@ build/aie_trace_${data_size}.mlir: aie2.py
 build/final_${data_size}.xclbin: build/aie_${data_size}.mlir build/scale.o
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
+    			--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 				--aie-generate-npu --npu-insts-name=insts_${data_size}.txt $(<:%=../%)
 
 build/final_trace_${data_size}.xclbin: build/aie_trace_${data_size}.mlir build/scale.o
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
+    			--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 				--aie-generate-npu --npu-insts-name=insts_${data_size}.txt $(<:%=../%)
 
 ${targetname}_${data_size}.exe: ${srcdir}/test.cpp
diff --git a/programming_examples/basic/vector_scalar_mul/run_makefile.lit b/programming_examples/basic/vector_scalar_mul/run_makefile.lit
index eb23a0be03..67384492ae 100644
--- a/programming_examples/basic/vector_scalar_mul/run_makefile.lit
+++ b/programming_examples/basic/vector_scalar_mul/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess
+// REQUIRES: ryzen_ai, peano 
 //
 // RUN: make -f %S/Makefile clean
 // RUN: make -f %S/Makefile 
diff --git a/programming_examples/basic/vector_vector_add/Makefile b/programming_examples/basic/vector_vector_add/Makefile
index 74c29b4795..3626f870e4 100755
--- a/programming_examples/basic/vector_vector_add/Makefile
+++ b/programming_examples/basic/vector_vector_add/Makefile
@@ -25,7 +25,7 @@ build/aie.mlir: ${srcdir}/aie2.py
 build/final.xclbin: build/aie.mlir
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
-    	--no-xchesscc --no-xbridge --peano ${PEANO_DIR} \
+    	--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 		--xclbin-name=${@F} --npu-insts-name=insts.txt ${<F}
 
 ${targetname}.exe: ${srcdir}/test.cpp
diff --git a/programming_examples/basic/vector_vector_add/README.md b/programming_examples/basic/vector_vector_add/README.md
index 2bb6d6c4d2..332eb7a807 100644
--- a/programming_examples/basic/vector_vector_add/README.md
+++ b/programming_examples/basic/vector_vector_add/README.md
@@ -12,8 +12,6 @@
 
 A simple binary operator, which uses a single AIE core to add two vectors together.  The overall vector size in this design is `256` and it processed by the core in smaller sub tiles of size `16`.  It shows how simple it can be to just feed data into the AIEs using the Object FIFO abstraction, and drain the results back to external memory.  This reference design can be run on either a Ryzen™ AI NPU or a VCK5000.
 
-> **NOTE:** This example makes use of the [Peano](https://github.com/Xilinx/llvm-aie) compiler to compile an elf executed on the AIE core. Peano is an open source single-core compiler for AI Engines. It is a fork of LLVM extended to support the in-order, exposed-pipeline VLIW processor core.
-
 The kernel executes on AIE tile (`col`, 2). Both input vectors are brought into the tile from Shim tile (`col`, 0). The value of `col` is dependent on whether the application is targeting NPU or VCK5000. The AIE tile performs the summation operations and the Shim tile brings the data back out to external memory.
 
 ## Source Files Overview
diff --git a/programming_examples/basic/vector_vector_modulo/Makefile b/programming_examples/basic/vector_vector_modulo/Makefile
index 9bea289476..cb9d8ab29e 100755
--- a/programming_examples/basic/vector_vector_modulo/Makefile
+++ b/programming_examples/basic/vector_vector_modulo/Makefile
@@ -25,6 +25,7 @@ build/aie.mlir: ${srcdir}/aie2.py
 build/final.xclbin: build/aie.mlir
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
+    	--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 		--xclbin-name=${@F} --npu-insts-name=insts.txt ${<F}
 
 ${targetname}.exe: ${srcdir}/test.cpp
diff --git a/programming_examples/basic/vector_vector_modulo/run_makefile.lit b/programming_examples/basic/vector_vector_modulo/run_makefile.lit
index 6875524001..cdae3657a2 100644
--- a/programming_examples/basic/vector_vector_modulo/run_makefile.lit
+++ b/programming_examples/basic/vector_vector_modulo/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess
+// REQUIRES: ryzen_ai, peano 
 //
 // RUN: make -f %S/Makefile clean
 // RUN: make -f %S/Makefile 
diff --git a/programming_examples/basic/vector_vector_mul/Makefile b/programming_examples/basic/vector_vector_mul/Makefile
index b69eff6ff9..84a05d125b 100755
--- a/programming_examples/basic/vector_vector_mul/Makefile
+++ b/programming_examples/basic/vector_vector_mul/Makefile
@@ -25,6 +25,7 @@ build/aie.mlir: ${srcdir}/aie2.py
 build/final.xclbin: build/aie.mlir
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
+    	--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 		--xclbin-name=${@F} --npu-insts-name=insts.txt ${<F}
 
 ${targetname}.exe: ${srcdir}/test.cpp
diff --git a/programming_examples/basic/vector_vector_mul/run_makefile.lit b/programming_examples/basic/vector_vector_mul/run_makefile.lit
index 6875524001..cdae3657a2 100644
--- a/programming_examples/basic/vector_vector_mul/run_makefile.lit
+++ b/programming_examples/basic/vector_vector_mul/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess
+// REQUIRES: ryzen_ai, peano 
 //
 // RUN: make -f %S/Makefile clean
 // RUN: make -f %S/Makefile 
diff --git a/programming_examples/lit.cfg.py b/programming_examples/lit.cfg.py
index 026e0e962b..97e1246045 100755
--- a/programming_examples/lit.cfg.py
+++ b/programming_examples/lit.cfg.py
@@ -222,8 +222,6 @@ def prepend_path(path):
 
 
 # Setup the path.
-prepend_path(config.llvm_tools_dir)
-prepend_path(config.peano_tools_dir)
 prepend_path(config.aie_tools_dir)
 # llvm_config.with_environment('LM_LICENSE_FILE', os.getenv('LM_LICENSE_FILE'))
 # llvm_config.with_environment('XILINXD_LICENSE_FILE', os.getenv('XILINXD_LICENSE_FILE'))
@@ -232,20 +230,34 @@ def prepend_path(path):
     prepend_path(config.vitis_aietools_bin)
     llvm_config.with_environment("VITIS", config.vitis_root)
 
+peano_tools_dir = os.path.join(config.peano_install_dir, "bin")
+prepend_path(config.llvm_tools_dir)
+prepend_path(peano_tools_dir)
+# Certainly the prepend works but I would rather be explicit
+config.substitutions.append(("%LLVM_TOOLS_DIR", config.llvm_tools_dir))
+
+prepend_path(config.aie_tools_dir)
+
+tool_dirs = [config.aie_tools_dir, config.llvm_tools_dir]
+
 # Test to see if we have the peano backend.
 try:
     result = subprocess.run(
-        [os.path.join(config.peano_tools_dir, "llc"), "-mtriple=aie", "--version"],
+        [os.path.join(peano_tools_dir, "llc"), "-mtriple=aie", "--version"],
         stdout=subprocess.PIPE,
         stderr=subprocess.PIPE,
     )
     if re.search("Xilinx AI Engine", result.stdout.decode("utf-8")) is not None:
         config.available_features.add("peano")
-        print("Peano found: " + shutil.which("llc"))
+        config.substitutions.append(("%PEANO_INSTALL_DIR", config.peano_install_dir))
+        config.environment["PEANO_INSTALL_DIR"] = config.peano_install_dir
+        print("Peano found: " + os.path.join(peano_tools_dir, "llc"))
+        tool_dirs.append(os.path.join(peano_tools_dir, "bin"))
     else:
-        print("Peano not found, but expected at ", config.peano_tools_dir)
+        print("Peano not found, but expected at ", peano_tools_dir)
 except Exception as e:
-    print("Peano not found, but expected at ", config.peano_tools_dir)
+    print("Peano not found, but expected at ", peano_tools_dir)
+
 
 if not config.enable_chess_tests:
     print("Chess tests disabled")
@@ -302,7 +314,6 @@ def prepend_path(path):
 for c in config.vitis_components:
     config.available_features.add(f"aietools_{c.lower()}")
 
-tool_dirs = [config.aie_tools_dir, config.peano_tools_dir, config.llvm_tools_dir]
 tools = [
     "aie-opt",
     "aie-translate",
diff --git a/programming_examples/lit.site.cfg.py.in b/programming_examples/lit.site.cfg.py.in
index 663e7499b1..22a367d1fc 100755
--- a/programming_examples/lit.site.cfg.py.in
+++ b/programming_examples/lit.site.cfg.py.in
@@ -20,7 +20,7 @@ config.llvm_lib_dir = "@LLVM_LIBRARY_DIR@"
 config.llvm_shlib_dir = "@SHLIBDIR@"
 config.llvm_shlib_ext = "@SHLIBEXT@"
 config.llvm_exe_ext = "@EXEEXT@"
-config.peano_tools_dir = "@PEANO_INSTALL_DIR@/bin"
+config.peano_install_dir = "@PEANO_INSTALL_DIR@"
 config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
 config.python_executable = "@Python3_EXECUTABLE@"
 config.gold_executable = "@GOLD_EXECUTABLE@"
diff --git a/programming_examples/makefile-common b/programming_examples/makefile-common
index b3951aaa8f..4523fe7c5f 100644
--- a/programming_examples/makefile-common
+++ b/programming_examples/makefile-common
@@ -3,12 +3,15 @@ AIETOOLS_DIR ?= $(shell realpath $(dir $(shell which xchesscc))/../)
 AIE_INCLUDE_DIR ?= ${AIETOOLS_DIR}/data/versal_prod/lib
 AIE2_INCLUDE_DIR ?= ${AIETOOLS_DIR}/data/aie_ml/lib
 
+WARNING_FLAGS = -Wno-parentheses -Wno-attributes -Wno-macro-redefined
+
 CHESSCC1_FLAGS = -f -p me -P ${AIE_INCLUDE_DIR} -I ${AIETOOLS_DIR}/include
 CHESSCC2_FLAGS = -f -p me -P ${AIE2_INCLUDE_DIR} -I ${AIETOOLS_DIR}/include -D__AIENGINE__=2 -D__AIEARCH__=20
 CHESS_FLAGS = -P ${AIE_INCLUDE_DIR}
 
 CHESSCCWRAP1_FLAGS = aie -I ${AIETOOLS_DIR}/include 
-CHESSCCWRAP2_FLAGS = aie2 -I ${AIETOOLS_DIR}/include 
+CHESSCCWRAP2_FLAGS = aie2 -I ${AIETOOLS_DIR}/include
+PEANOWRAP2_FLAGS = -O2 -v -std=c++20 --target=aie2-none-unknown-elf ${WARNING_FLAGS} -DNDEBUG -I ${AIETOOLS_DIR}/include 
 
 TEST_POWERSHELL := $(shell command -v powershell.exe >/dev/null 2>&1 && echo yes || echo no)
 ifeq ($(TEST_POWERSHELL),yes)
diff --git a/programming_examples/ml/bottleneck/Makefile b/programming_examples/ml/bottleneck/Makefile
index 5c696af170..6fd659a894 100755
--- a/programming_examples/ml/bottleneck/Makefile
+++ b/programming_examples/ml/bottleneck/Makefile
@@ -23,18 +23,23 @@ insts.txt: build/${mlirFileName}.mlir
 	aiecc.py -v --aie-only-generate-npu --npu-insts-name=$@ $<
 
 build/conv2dk1.o: conv2dk1.cc
-	xchesscc -d ${CHESSCC2_FLAGS} -DINT8_ACT -c $< -o $@
+	mkdir -p ${@D}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang ${PEANOWRAP2_FLAGS} -DINT8_ACT -c $< -o ${@F}
 
 build/conv2dk3.o: conv2dk3.cc
-	xchesscc -d ${CHESSCC2_FLAGS} -DUINT8_ACT -c $< -o $@
+	mkdir -p ${@D}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang ${PEANOWRAP2_FLAGS} -DUINT8_ACT -c $< -o ${@F}
 
 build/conv2dk1_skip.o: conv2dk1_skip.cc
-	xchesscc -d ${CHESSCC2_FLAGS} -DINT8_ACT -c $< -o $@
+	mkdir -p ${@D}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang ${PEANOWRAP2_FLAGS} -DINT8_ACT -c $< -o$ ${@F} 
 
 build/final.xclbin: build/${mlirFileName}.mlir build/conv2dk1.o build/conv2dk3.o build/conv2dk1_skip.o  
-	cd build && aiecc.py -v --aie-generate-cdo --aie-generate-npu --no-compile-host \
+	mkdir -p ${@D}
+	cd ${@D} && aiecc.py -v --aie-generate-cdo --aie-generate-npu --no-compile-host \
 		--basic-alloc-scheme \
-		--xclbin-name=${@F} --npu-insts-name=insts.txt ${<F}
+    	--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
+		--xclbin-name=${@F} --npu-insts-name=insts.txt $(<:%=../%) 
 
 clean:
 	rm -rf build *.elf* *.lst *.bif ${mlirFileName}.mlir.prj log .xclbin sim \
diff --git a/programming_examples/ml/bottleneck/run_makefile.lit b/programming_examples/ml/bottleneck/run_makefile.lit
index 6097345491..9c9ace1c2c 100644
--- a/programming_examples/ml/bottleneck/run_makefile.lit
+++ b/programming_examples/ml/bottleneck/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess, torch
+// REQUIRES: ryzen_ai, peano, torch
 //
 // RUN: make -f %S/Makefile clean
 // RUN: make -f %S/Makefile 
diff --git a/programming_examples/ml/conv2d/Makefile b/programming_examples/ml/conv2d/Makefile
index cdeb3188d7..215dc2cbc5 100755
--- a/programming_examples/ml/conv2d/Makefile
+++ b/programming_examples/ml/conv2d/Makefile
@@ -17,7 +17,7 @@ all: build/conv2dk1_i8.o build/final.xclbin
 
 build/conv2dk1_i8.o: conv2dk1_i8.cc
 	mkdir -p ${@D}
-	cd ${@D} && xchesscc_wrapper ${CHESSCCWRAP2_FLAGS} -DINT8_ACT -c $< -o ${@F}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang ${PEANOWRAP2_FLAGS} -DINT8_ACT -c $< -o ${@F}
 
 build/${mlirFileName}.mlir: ${srcdir}/aie2.py
 	mkdir -p ${@D}
@@ -26,6 +26,7 @@ build/${mlirFileName}.mlir: ${srcdir}/aie2.py
 build/final.xclbin: build/${mlirFileName}.mlir build/conv2dk1_i8.o 
 	mkdir -p ${@D} 
 	cd ${@D} && aiecc.py -v --aie-generate-cdo --aie-generate-npu --no-compile-host \
+    	--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 		--xclbin-name=${@F} --npu-insts-name=insts.txt $(<:%=../%)
 
 run_py: build/final.xclbin build/insts.txt
diff --git a/programming_examples/ml/conv2d/run_makefile.lit b/programming_examples/ml/conv2d/run_makefile.lit
index 6097345491..9c9ace1c2c 100644
--- a/programming_examples/ml/conv2d/run_makefile.lit
+++ b/programming_examples/ml/conv2d/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess, torch
+// REQUIRES: ryzen_ai, peano, torch
 //
 // RUN: make -f %S/Makefile clean
 // RUN: make -f %S/Makefile 
diff --git a/programming_examples/ml/conv2d_fused_relu/Makefile b/programming_examples/ml/conv2d_fused_relu/Makefile
index 755e2d4f7f..d7bb4226b3 100755
--- a/programming_examples/ml/conv2d_fused_relu/Makefile
+++ b/programming_examples/ml/conv2d_fused_relu/Makefile
@@ -24,11 +24,14 @@ insts.txt: build/${mlirFileName}.mlir
 	aiecc.py -v --aie-only-generate-npu --npu-insts-name=$@ $<
 
 build/conv2dk1.o: conv2dk1.cc
-	xchesscc -d ${CHESSCC2_FLAGS} -DINT8_ACT -c $< -o $@
+	mkdir -p ${@D}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang ${PEANOWRAP2_FLAGS} -DINT8_ACT -c $< -o$ ${@F} 
 
 build/final.xclbin: build/${mlirFileName}.mlir build/conv2dk1.o  
-	cd build && aiecc.py -v --aie-generate-cdo --aie-generate-npu --no-compile-host \
-		--xclbin-name=${@F} --npu-insts-name=insts.txt ${<F}
+	mkdir -p ${@D}
+	cd ${@D} && aiecc.py -v --aie-generate-cdo --aie-generate-npu --no-compile-host \
+    	--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
+		--xclbin-name=${@F} --npu-insts-name=insts.txt $(<:%=../%) 
 
 clean:
 	rm -rf build *.elf* *.lst *.bif ${mlirFileName}.mlir.prj log* *.xclbin sim \
diff --git a/programming_examples/ml/conv2d_fused_relu/run_makefile.lit b/programming_examples/ml/conv2d_fused_relu/run_makefile.lit
index 6097345491..9c9ace1c2c 100644
--- a/programming_examples/ml/conv2d_fused_relu/run_makefile.lit
+++ b/programming_examples/ml/conv2d_fused_relu/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess, torch
+// REQUIRES: ryzen_ai, peano, torch
 //
 // RUN: make -f %S/Makefile clean
 // RUN: make -f %S/Makefile 
diff --git a/programming_examples/ml/eltwise_add/Makefile b/programming_examples/ml/eltwise_add/Makefile
index 21cd3265e3..2709404dd4 100644
--- a/programming_examples/ml/eltwise_add/Makefile
+++ b/programming_examples/ml/eltwise_add/Makefile
@@ -21,7 +21,7 @@ VPATH := ${srcdir}/../../../aie_kernels/aie2
 
 build/%.o: %.cc
 	mkdir -p ${@D}
-	cd ${@D} && xchesscc_wrapper ${CHESSCCWRAP2_FLAGS} -c $< -o ${@F}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang++ ${PEANOWRAP2_FLAGS} -c $< -o ${@F}
 
 build/aie.mlir: ${srcdir}/aie2.py
 	mkdir -p ${@D}
@@ -34,11 +34,13 @@ build/aie_trace.mlir: ${srcdir}/aie2.py
 build/final.xclbin: build/aie.mlir build/add.o
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
+    	--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 		--xclbin-name=${@F} --npu-insts-name=insts.txt ${<F}
 
 build/final_trace.xclbin: build/aie_trace.mlir build/add.o
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
+    	--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 		--xclbin-name=${@F} --npu-insts-name=insts.txt ${<F}
 
 ${targetname}.exe: ${srcdir}/test.cpp
diff --git a/programming_examples/ml/eltwise_add/run_makefile.lit b/programming_examples/ml/eltwise_add/run_makefile.lit
index 6875524001..cdae3657a2 100644
--- a/programming_examples/ml/eltwise_add/run_makefile.lit
+++ b/programming_examples/ml/eltwise_add/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess
+// REQUIRES: ryzen_ai, peano 
 //
 // RUN: make -f %S/Makefile clean
 // RUN: make -f %S/Makefile 
diff --git a/programming_examples/ml/eltwise_mul/Makefile b/programming_examples/ml/eltwise_mul/Makefile
index 317f66d8d9..488806c707 100644
--- a/programming_examples/ml/eltwise_mul/Makefile
+++ b/programming_examples/ml/eltwise_mul/Makefile
@@ -21,7 +21,7 @@ VPATH := ${srcdir}/../../../aie_kernels/aie2
 
 build/%.o: %.cc
 	mkdir -p ${@D}
-	cd ${@D} && xchesscc_wrapper ${CHESSCCWRAP2_FLAGS} -c $< -o ${@F}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang++ ${PEANOWRAP2_FLAGS} -c $< -o ${@F}
 
 build/aie.mlir: ${srcdir}/aie2.py
 	mkdir -p ${@D}
@@ -34,11 +34,13 @@ build/aie_trace.mlir: ${srcdir}/aie2.py
 build/final.xclbin: build/aie.mlir build/mul.o
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
+    	--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 		--xclbin-name=${@F} --npu-insts-name=insts.txt ${<F}
 
 build/final_trace.xclbin: build/aie_trace.mlir build/mul.o
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
+    	--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 		--xclbin-name=${@F} --npu-insts-name=insts.txt ${<F}
 
 
diff --git a/programming_examples/ml/eltwise_mul/run_makefile.lit b/programming_examples/ml/eltwise_mul/run_makefile.lit
index 6875524001..cdae3657a2 100644
--- a/programming_examples/ml/eltwise_mul/run_makefile.lit
+++ b/programming_examples/ml/eltwise_mul/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess
+// REQUIRES: ryzen_ai, peano 
 //
 // RUN: make -f %S/Makefile clean
 // RUN: make -f %S/Makefile 
diff --git a/programming_examples/ml/relu/Makefile b/programming_examples/ml/relu/Makefile
index 441482d352..2a5dc0ddb3 100644
--- a/programming_examples/ml/relu/Makefile
+++ b/programming_examples/ml/relu/Makefile
@@ -21,7 +21,7 @@ VPATH := ${srcdir}/../../../aie_kernels/aie2
 
 build/%.o: %.cc
 	mkdir -p ${@D}
-	cd ${@D} && xchesscc_wrapper ${CHESSCCWRAP2_FLAGS} -c $< -o ${@F}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang++ ${PEANOWRAP2_FLAGS} -c $< -o ${@F}
 
 build/aie.mlir: ${srcdir}/aie2.py
 	mkdir -p ${@D}
@@ -34,11 +34,13 @@ build/aie_trace.mlir: ${srcdir}/aie2.py
 build/final.xclbin: build/aie.mlir build/relu.o
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
+    	--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 		--xclbin-name=${@F} --npu-insts-name=insts.txt ${<F}
 
 build/final_trace.xclbin: build/aie_trace.mlir build/relu.o
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
+    	--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 		--xclbin-name=${@F} --npu-insts-name=insts.txt ${<F}
 
 ${targetname}.exe: ${srcdir}/test.cpp
diff --git a/programming_examples/ml/relu/run_makefile.lit b/programming_examples/ml/relu/run_makefile.lit
index 6875524001..cdae3657a2 100644
--- a/programming_examples/ml/relu/run_makefile.lit
+++ b/programming_examples/ml/relu/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess
+// REQUIRES: ryzen_ai, peano 
 //
 // RUN: make -f %S/Makefile clean
 // RUN: make -f %S/Makefile 
diff --git a/programming_examples/ml/resnet/layers_conv2_x/Makefile b/programming_examples/ml/resnet/layers_conv2_x/Makefile
index 1e63f3741d..35e49bd366 100755
--- a/programming_examples/ml/resnet/layers_conv2_x/Makefile
+++ b/programming_examples/ml/resnet/layers_conv2_x/Makefile
@@ -23,23 +23,30 @@ build/${mlirFileName}.mlir: ${srcdir}/aie2.py
 	python3 $< > $@
 
 build/conv2dk1_i8.o: conv2dk1.cc
-	xchesscc -d ${CHESSCC2_FLAGS} -DINT8_ACT -c $< -o $@
+	mkdir -p ${@D}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang++ ${PEANOWRAP2_FLAGS} -DINT8_ACT -c $< -o ${@F}
 
 build/conv2dk3.o: conv2dk3.cc
-	xchesscc -d ${CHESSCC2_FLAGS} -DUINT8_ACT -c $< -o $@
+	mkdir -p ${@D}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang++ ${PEANOWRAP2_FLAGS} -DUINT8_ACT -c $< -o ${@F}
 
 build/conv2dk1_skip_init.o: conv2dk1_skip_init.cc
-	xchesscc -d ${CHESSCC2_FLAGS} -DINT8_ACT -c $< -o $@
+	mkdir -p ${@D}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang++ ${PEANOWRAP2_FLAGS} -DINT8_ACT -c $< -o ${@F}
 
 build/conv2dk1_ui8.o: conv2dk1.cc
-	xchesscc -d ${CHESSCC2_FLAGS} -DUINT8_ACT -c $< -o $@
+	mkdir -p ${@D}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang++ ${PEANOWRAP2_FLAGS} -DUINT8_ACT -c $< -o ${@F}
 
 build/conv2dk1_skip.o: conv2dk1_skip.cc
-	xchesscc -d ${CHESSCC2_FLAGS} -DUINT8_ACT -c $< -o $@
+	mkdir -p ${@D}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang++ ${PEANOWRAP2_FLAGS} -DUINT8_ACT -c $< -o ${@F}
 
 build/final.xclbin: build/${mlirFileName}.mlir build/conv2dk1_i8.o build/conv2dk1_skip_init.o build/conv2dk3.o build/conv2dk1_skip.o build/conv2dk1_ui8.o
-	cd build && aiecc.py --basic-alloc-scheme --aie-generate-cdo --aie-generate-npu --no-compile-host \
-		--xclbin-name=${@F} --npu-insts-name=insts.txt ${<F}
+	mkdir -p ${@D}
+	cd ${@D} &&	aiecc.py --basic-alloc-scheme --aie-generate-cdo --aie-generate-npu --no-compile-host \
+    	--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
+		--xclbin-name=${@F} --npu-insts-name=insts.txt $(<:%=../%)
 clean:
 	rm -rf build log
 
diff --git a/programming_examples/ml/resnet/layers_conv2_x/run_makefile.lit b/programming_examples/ml/resnet/layers_conv2_x/run_makefile.lit
index 6097345491..9c9ace1c2c 100644
--- a/programming_examples/ml/resnet/layers_conv2_x/run_makefile.lit
+++ b/programming_examples/ml/resnet/layers_conv2_x/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
-// REQUIRES: ryzen_ai, chess, torch
+// REQUIRES: ryzen_ai, peano, torch
 //
 // RUN: make -f %S/Makefile clean
 // RUN: make -f %S/Makefile 
diff --git a/programming_examples/ml/softmax/run_makefile.lit b/programming_examples/ml/softmax/run_makefile.lit
index 6875524001..c602b21317 100644
--- a/programming_examples/ml/softmax/run_makefile.lit
+++ b/programming_examples/ml/softmax/run_makefile.lit
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 // REQUIRES: ryzen_ai, chess
+// XFAIL: *
 //
 // RUN: make -f %S/Makefile clean
 // RUN: make -f %S/Makefile 
diff --git a/programming_examples/vision/color_detect/Makefile b/programming_examples/vision/color_detect/Makefile
index 5f7190af1b..f0600efc88 100755
--- a/programming_examples/vision/color_detect/Makefile
+++ b/programming_examples/vision/color_detect/Makefile
@@ -29,7 +29,7 @@ mlir: build/aie2_lineBased_8b_${COLORDETECT_WIDTH}.mlir
 
 build/%.cc.o: %.cc
 	mkdir -p ${@D}
-	cd ${@D} && xchesscc_wrapper ${CHESSCCWRAP2_FLAGS} -DBIT_WIDTH=8 -c $< -o ${@F}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang++ ${PEANOWRAP2_FLAGS} -DBIT_WIDTH=8 -c $< -o ${@F}
 
 build/combined_bitwiseOR_gray2rgba_bitwiseAND.a: build/bitwiseOR.cc.o build/gray2rgba.cc.o build/bitwiseAND.cc.o
 	mkdir -p ${@D}
@@ -42,6 +42,7 @@ build/aie2_lineBased_8b_${COLORDETECT_WIDTH}.mlir: ${srcdir}/aie2_colorDetect.py
 build/final_${COLORDETECT_WIDTH}.xclbin: build/aie2_lineBased_8b_${COLORDETECT_WIDTH}.mlir build/rgba2hue.cc.o build/threshold.cc.o build/combined_bitwiseOR_gray2rgba_bitwiseAND.a
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host --basic-alloc-scheme \
+    	--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 		--xclbin-name=${@F} --npu-insts-name=insts.txt $(<:%=../%)
 
 ${targetname}.exe: ${srcdir}/test.cpp
diff --git a/programming_examples/vision/color_detect/run_makefile.lit b/programming_examples/vision/color_detect/run_makefile.lit
index 15e4f7b6cc..c6e18a3da4 100644
--- a/programming_examples/vision/color_detect/run_makefile.lit
+++ b/programming_examples/vision/color_detect/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
  // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  //
- // REQUIRES: ryzen_ai, chess, opencv
+ // REQUIRES: ryzen_ai, peano, opencv
  //
  // RUN: make -f %S/Makefile clean
  // RUN: make -f %S/Makefile 
diff --git a/programming_examples/vision/color_threshold/Makefile b/programming_examples/vision/color_threshold/Makefile
index 740ae6bc0c..46b079ea45 100644
--- a/programming_examples/vision/color_threshold/Makefile
+++ b/programming_examples/vision/color_threshold/Makefile
@@ -26,7 +26,7 @@ mlir: build/aie2_${COLORTHRESHOLD_WIDTH}.mlir
 
 build/%.cc.o: %.cc
 	mkdir -p ${@D}
-	cd ${@D} && xchesscc_wrapper ${CHESSCCWRAP2_FLAGS} -d -DBIT_WIDTH=8 -c $< -o ${@F}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang++ ${PEANOWRAP2_FLAGS} -DBIT_WIDTH=8 -c $< -o ${@F}
 	
 build/aie2_${COLORTHRESHOLD_WIDTH}.mlir: ${srcdir}/aie2_colorThreshold.py
 	mkdir -p ${@D}
@@ -35,6 +35,7 @@ build/aie2_${COLORTHRESHOLD_WIDTH}.mlir: ${srcdir}/aie2_colorThreshold.py
 build/final_${COLORTHRESHOLD_WIDTH}.xclbin: build/aie2_${COLORTHRESHOLD_WIDTH}.mlir build/threshold.cc.o
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host --basic-alloc-scheme \
+    	--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 		--xclbin-name=${@F} --npu-insts-name=insts.txt $(<:%=../%)
 
 ${targetname}.exe: ${srcdir}/test.cpp
diff --git a/programming_examples/vision/color_threshold/run_makefile.lit b/programming_examples/vision/color_threshold/run_makefile.lit
index 15e4f7b6cc..c6e18a3da4 100644
--- a/programming_examples/vision/color_threshold/run_makefile.lit
+++ b/programming_examples/vision/color_threshold/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
  // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  //
- // REQUIRES: ryzen_ai, chess, opencv
+ // REQUIRES: ryzen_ai, peano, opencv
  //
  // RUN: make -f %S/Makefile clean
  // RUN: make -f %S/Makefile 
diff --git a/programming_examples/vision/edge_detect/Makefile b/programming_examples/vision/edge_detect/Makefile
index 19e1ccd734..8db0cf1cdb 100755
--- a/programming_examples/vision/edge_detect/Makefile
+++ b/programming_examples/vision/edge_detect/Makefile
@@ -29,7 +29,7 @@ mlir: build/aie2_lineBased_8b_${EDGEDETECT_WIDTH}.mlir
 
 build/%.cc.o: %.cc
 	mkdir -p ${@D}
-	cd ${@D} && xchesscc_wrapper ${CHESSCCWRAP2_FLAGS} -DBIT_WIDTH=8 -c $< -o ${@F}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang++ ${PEANOWRAP2_FLAGS} -DBIT_WIDTH=8 -c $< -o ${@F}
 
 build/combined_gray2rgba_addWeighted.a: build/gray2rgba.cc.o build/addWeighted.cc.o
 	mkdir -p ${@D}
@@ -42,6 +42,7 @@ build/aie2_lineBased_8b_${EDGEDETECT_WIDTH}.mlir: ${srcdir}/aie2_edgeDetect.py
 build/final_${EDGEDETECT_WIDTH}.xclbin: build/aie2_lineBased_8b_${EDGEDETECT_WIDTH}.mlir build/rgba2gray.cc.o build/gray2rgba.cc.o build/filter2d.cc.o build/threshold.cc.o build/addWeighted.cc.o build/combined_gray2rgba_addWeighted.a
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host --basic-alloc-scheme \
+    	--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 		--xclbin-name=${@F} --npu-insts-name=insts.txt $(<:%=../%)
 
 ${targetname}.exe: ${srcdir}/test.cpp
diff --git a/programming_examples/vision/edge_detect/run_makefile.lit b/programming_examples/vision/edge_detect/run_makefile.lit
index 15e4f7b6cc..c6e18a3da4 100644
--- a/programming_examples/vision/edge_detect/run_makefile.lit
+++ b/programming_examples/vision/edge_detect/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
  // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  //
- // REQUIRES: ryzen_ai, chess, opencv
+ // REQUIRES: ryzen_ai, peano, opencv
  //
  // RUN: make -f %S/Makefile clean
  // RUN: make -f %S/Makefile 
diff --git a/programming_examples/vision/vision_passthrough/Makefile b/programming_examples/vision/vision_passthrough/Makefile
index e86aac2f99..99005072bf 100644
--- a/programming_examples/vision/vision_passthrough/Makefile
+++ b/programming_examples/vision/vision_passthrough/Makefile
@@ -30,11 +30,12 @@ build/aie2_lineBased_8b_${PASSTHROUGH_WIDTH}.mlir: ${srcdir}/aie2.py
 
 build/passThrough.cc.o: passThrough.cc
 	mkdir -p ${@D}
-	cd ${@D} && xchesscc_wrapper ${CHESSCCWRAP2_FLAGS} -DBIT_WIDTH=8 -c $< -o ${@F}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang++ ${PEANOWRAP2_FLAGS} -DBIT_WIDTH=8 -c $< -o ${@F}
 	
 build/final_${PASSTHROUGH_WIDTH}.xclbin: build/aie2_lineBased_8b_${PASSTHROUGH_WIDTH}.mlir build/passThrough.cc.o
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host --basic-alloc-scheme \
+    	--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 		--xclbin-name=${@F} --npu-insts-name=insts.txt $(<:%=../%)
 
 ${targetname}.exe: ${srcdir}/test.cpp
diff --git a/programming_examples/vision/vision_passthrough/run_makefile.lit b/programming_examples/vision/vision_passthrough/run_makefile.lit
index 15e4f7b6cc..c6e18a3da4 100644
--- a/programming_examples/vision/vision_passthrough/run_makefile.lit
+++ b/programming_examples/vision/vision_passthrough/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
  // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  //
- // REQUIRES: ryzen_ai, chess, opencv
+ // REQUIRES: ryzen_ai, peano, opencv
  //
  // RUN: make -f %S/Makefile clean
  // RUN: make -f %S/Makefile 
diff --git a/programming_guide/lit.cfg.py b/programming_guide/lit.cfg.py
index 158b539f50..e4df9d383f 100755
--- a/programming_guide/lit.cfg.py
+++ b/programming_guide/lit.cfg.py
@@ -222,8 +222,6 @@ def prepend_path(path):
 
 
 # Setup the path.
-prepend_path(config.llvm_tools_dir)
-prepend_path(config.peano_tools_dir)
 prepend_path(config.aie_tools_dir)
 # llvm_config.with_environment('LM_LICENSE_FILE', os.getenv('LM_LICENSE_FILE'))
 # llvm_config.with_environment('XILINXD_LICENSE_FILE', os.getenv('XILINXD_LICENSE_FILE'))
@@ -232,20 +230,34 @@ def prepend_path(path):
     prepend_path(config.vitis_aietools_bin)
     llvm_config.with_environment("VITIS", config.vitis_root)
 
+peano_tools_dir = os.path.join(config.peano_install_dir, "bin")
+prepend_path(config.llvm_tools_dir)
+prepend_path(peano_tools_dir)
+# Certainly the prepend works but I would rather be explicit
+config.substitutions.append(("%LLVM_TOOLS_DIR", config.llvm_tools_dir))
+
+prepend_path(config.aie_tools_dir)
+
+tool_dirs = [config.aie_tools_dir, config.llvm_tools_dir]
+
 # Test to see if we have the peano backend.
 try:
     result = subprocess.run(
-        [os.path.join(config.peano_tools_dir, "llc"), "-mtriple=aie", "--version"],
+        [os.path.join(peano_tools_dir, "llc"), "-mtriple=aie", "--version"],
         stdout=subprocess.PIPE,
         stderr=subprocess.PIPE,
     )
     if re.search("Xilinx AI Engine", result.stdout.decode("utf-8")) is not None:
         config.available_features.add("peano")
-        print("Peano found: " + shutil.which("llc"))
+        config.substitutions.append(("%PEANO_INSTALL_DIR", config.peano_install_dir))
+        config.environment["PEANO_INSTALL_DIR"] = config.peano_install_dir
+        print("Peano found: " + os.path.join(peano_tools_dir, "llc"))
+        tool_dirs.append(os.path.join(peano_tools_dir, "bin"))
     else:
-        print("Peano not found, but expected at ", config.peano_tools_dir)
+        print("Peano not found, but expected at ", peano_tools_dir)
 except Exception as e:
-    print("Peano not found, but expected at ", config.peano_tools_dir)
+    print("Peano not found, but expected at ", peano_tools_dir)
+
 
 if not config.enable_chess_tests:
     print("Chess tests disabled")
@@ -302,7 +314,6 @@ def prepend_path(path):
 for c in config.vitis_components:
     config.available_features.add(f"aietools_{c.lower()}")
 
-tool_dirs = [config.aie_tools_dir, config.peano_tools_dir, config.llvm_tools_dir]
 tools = [
     "aie-opt",
     "aie-translate",
diff --git a/programming_guide/lit.site.cfg.py.in b/programming_guide/lit.site.cfg.py.in
index 663e7499b1..22a367d1fc 100755
--- a/programming_guide/lit.site.cfg.py.in
+++ b/programming_guide/lit.site.cfg.py.in
@@ -20,7 +20,7 @@ config.llvm_lib_dir = "@LLVM_LIBRARY_DIR@"
 config.llvm_shlib_dir = "@SHLIBDIR@"
 config.llvm_shlib_ext = "@SHLIBEXT@"
 config.llvm_exe_ext = "@EXEEXT@"
-config.peano_tools_dir = "@PEANO_INSTALL_DIR@/bin"
+config.peano_install_dir = "@PEANO_INSTALL_DIR@"
 config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
 config.python_executable = "@Python3_EXECUTABLE@"
 config.gold_executable = "@GOLD_EXECUTABLE@"
diff --git a/programming_guide/section-1/run_makefile.lit b/programming_guide/section-1/run_makefile.lit
index fd436178e2..69b439efc5 100644
--- a/programming_guide/section-1/run_makefile.lit
+++ b/programming_guide/section-1/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
  // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  //
- // REQUIRES: ryzen_ai, chess
+ // REQUIRES: ryzen_ai, peano 
  //
  // RUN: make -f %S/Makefile clean
  // RUN: make -f %S/Makefile 
\ No newline at end of file
diff --git a/programming_guide/section-2/section-2d/run_makefile.lit b/programming_guide/section-2/section-2d/run_makefile.lit
index fd436178e2..8eb80d60db 100644
--- a/programming_guide/section-2/section-2d/run_makefile.lit
+++ b/programming_guide/section-2/section-2d/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
  // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  //
- // REQUIRES: ryzen_ai, chess
+ // REQUIRES: ryzen_ai, peano
  //
  // RUN: make -f %S/Makefile clean
- // RUN: make -f %S/Makefile 
\ No newline at end of file
+ // RUN: make -f %S/Makefile 
diff --git a/programming_guide/section-2/section-2e/01_single_double_buffer/run_makefile.lit b/programming_guide/section-2/section-2e/01_single_double_buffer/run_makefile.lit
index fd436178e2..69b439efc5 100644
--- a/programming_guide/section-2/section-2e/01_single_double_buffer/run_makefile.lit
+++ b/programming_guide/section-2/section-2e/01_single_double_buffer/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
  // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  //
- // REQUIRES: ryzen_ai, chess
+ // REQUIRES: ryzen_ai, peano 
  //
  // RUN: make -f %S/Makefile clean
  // RUN: make -f %S/Makefile 
\ No newline at end of file
diff --git a/programming_guide/section-2/section-2e/02_external_mem_to_core/Makefile b/programming_guide/section-2/section-2e/02_external_mem_to_core/Makefile
index 7b7616c946..6f9abd3a10 100644
--- a/programming_guide/section-2/section-2e/02_external_mem_to_core/Makefile
+++ b/programming_guide/section-2/section-2e/02_external_mem_to_core/Makefile
@@ -23,6 +23,7 @@ build/aie.mlir: ${srcdir}/ext_to_core.py
 build/final.xclbin: build/aie.mlir
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
+    			--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 				--aie-generate-npu --npu-insts-name=insts.txt $(<:%=../%)
 
 ${targetname}.exe: ${srcdir}/test.cpp
diff --git a/programming_guide/section-2/section-2e/02_external_mem_to_core/run_makefile.lit b/programming_guide/section-2/section-2e/02_external_mem_to_core/run_makefile.lit
index a7b1bf34a4..1f6ec28eed 100644
--- a/programming_guide/section-2/section-2e/02_external_mem_to_core/run_makefile.lit
+++ b/programming_guide/section-2/section-2e/02_external_mem_to_core/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
  // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  //
- // REQUIRES: ryzen_ai, chess
+ // REQUIRES: ryzen_ai, peano
  //
  // RUN: make -f %S/Makefile clean
  // RUN: make -f %S/Makefile 
diff --git a/programming_guide/section-2/section-2e/03_external_mem_to_core_L2/Makefile b/programming_guide/section-2/section-2e/03_external_mem_to_core_L2/Makefile
index d59c441166..bae94b011a 100644
--- a/programming_guide/section-2/section-2e/03_external_mem_to_core_L2/Makefile
+++ b/programming_guide/section-2/section-2e/03_external_mem_to_core_L2/Makefile
@@ -23,6 +23,7 @@ build/aie.mlir: ${srcdir}/ext_to_core_L2.py
 build/final.xclbin: build/aie.mlir
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
+    			--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 				--aie-generate-npu --npu-insts-name=insts.txt $(<:%=../%)
 
 ${targetname}.exe: ${srcdir}/test.cpp
diff --git a/programming_guide/section-2/section-2e/03_external_mem_to_core_L2/run_makefile.lit b/programming_guide/section-2/section-2e/03_external_mem_to_core_L2/run_makefile.lit
index a7b1bf34a4..1f6ec28eed 100644
--- a/programming_guide/section-2/section-2e/03_external_mem_to_core_L2/run_makefile.lit
+++ b/programming_guide/section-2/section-2e/03_external_mem_to_core_L2/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
  // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  //
- // REQUIRES: ryzen_ai, chess
+ // REQUIRES: ryzen_ai, peano
  //
  // RUN: make -f %S/Makefile clean
  // RUN: make -f %S/Makefile 
diff --git a/programming_guide/section-2/section-2e/04_distribute_L2/Makefile b/programming_guide/section-2/section-2e/04_distribute_L2/Makefile
index 15801a682b..4e2bd5a4b6 100644
--- a/programming_guide/section-2/section-2e/04_distribute_L2/Makefile
+++ b/programming_guide/section-2/section-2e/04_distribute_L2/Makefile
@@ -23,6 +23,7 @@ build/aie.mlir: ${srcdir}/distribute_L2.py
 build/final.xclbin: build/aie.mlir
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
+    			--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 				--aie-generate-npu --npu-insts-name=insts.txt $(<:%=../%)
 
 ${targetname}.exe: ${srcdir}/test.cpp
diff --git a/programming_guide/section-2/section-2e/04_distribute_L2/run_makefile.lit b/programming_guide/section-2/section-2e/04_distribute_L2/run_makefile.lit
index a7b1bf34a4..1f6ec28eed 100644
--- a/programming_guide/section-2/section-2e/04_distribute_L2/run_makefile.lit
+++ b/programming_guide/section-2/section-2e/04_distribute_L2/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
  // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  //
- // REQUIRES: ryzen_ai, chess
+ // REQUIRES: ryzen_ai, peano
  //
  // RUN: make -f %S/Makefile clean
  // RUN: make -f %S/Makefile 
diff --git a/programming_guide/section-2/section-2e/05_join_L2/Makefile b/programming_guide/section-2/section-2e/05_join_L2/Makefile
index ae43cb353e..f7a3a8958d 100644
--- a/programming_guide/section-2/section-2e/05_join_L2/Makefile
+++ b/programming_guide/section-2/section-2e/05_join_L2/Makefile
@@ -23,6 +23,7 @@ build/aie.mlir: ${srcdir}/distribute_and_join_L2.py
 build/final.xclbin: build/aie.mlir
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
+    			--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 				--aie-generate-npu --npu-insts-name=insts.txt $(<:%=../%)
 
 ${targetname}.exe: ${srcdir}/test.cpp
diff --git a/programming_guide/section-2/section-2e/05_join_L2/run_makefile.lit b/programming_guide/section-2/section-2e/05_join_L2/run_makefile.lit
index a7b1bf34a4..1f6ec28eed 100644
--- a/programming_guide/section-2/section-2e/05_join_L2/run_makefile.lit
+++ b/programming_guide/section-2/section-2e/05_join_L2/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
  // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  //
- // REQUIRES: ryzen_ai, chess
+ // REQUIRES: ryzen_ai, peano
  //
  // RUN: make -f %S/Makefile clean
  // RUN: make -f %S/Makefile 
diff --git a/programming_guide/section-3/Makefile b/programming_guide/section-3/Makefile
index f2536fc7c6..596f7c2a2f 100644
--- a/programming_guide/section-3/Makefile
+++ b/programming_guide/section-3/Makefile
@@ -20,11 +20,12 @@ build/aie.mlir: ${srcdir}/aie2.py
 	
 build/scale.o: ${srcdir}/vector_scalar_mul.cc
 	mkdir -p ${@D}
-	cd ${@D} && xchesscc_wrapper ${CHESSCCWRAP2_FLAGS} -c $< -o ${@F}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang++ ${PEANOWRAP2_FLAGS} -c $< -o ${@F}
 
 build/final.xclbin: build/aie.mlir build/scale.o
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
+    			--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 				--aie-generate-npu --npu-insts-name=insts.txt $(<:%=../%)
 
 ${targetname}.exe: ${srcdir}/test.cpp
diff --git a/programming_guide/section-3/run_makefile.lit b/programming_guide/section-3/run_makefile.lit
index e8cc49032b..b180716f73 100644
--- a/programming_guide/section-3/run_makefile.lit
+++ b/programming_guide/section-3/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
  // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  //
- // REQUIRES: ryzen_ai, chess
+ // REQUIRES: ryzen_ai, peano 
  //
  // RUN: make -f %S/Makefile clean
  // RUN: make -f %S/Makefile 
diff --git a/programming_guide/section-4/section-4a/Makefile b/programming_guide/section-4/section-4a/Makefile
index 330041419f..d7cf0ad6e1 100644
--- a/programming_guide/section-4/section-4a/Makefile
+++ b/programming_guide/section-4/section-4a/Makefile
@@ -20,11 +20,12 @@ build/aie.mlir: ${srcdir}/aie2.py
 
 build/scale.o: ${srcdir}/vector_scalar_mul.cc
 	mkdir -p ${@D}
-	cd ${@D} && xchesscc_wrapper ${CHESSCCWRAP2_FLAGS} -c $< -o ${@F}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang++ ${PEANOWRAP2_FLAGS} -c $< -o ${@F}
 
 build/final.xclbin: build/aie.mlir build/scale.o
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
+    			--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 				--aie-generate-npu --npu-insts-name=insts.txt $(<:%=../%)
 
 ${targetname}.exe: ${srcdir}/test.cpp
diff --git a/programming_guide/section-4/section-4a/run_makefile.lit b/programming_guide/section-4/section-4a/run_makefile.lit
index e8cc49032b..86d9f827c7 100644
--- a/programming_guide/section-4/section-4a/run_makefile.lit
+++ b/programming_guide/section-4/section-4a/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
  // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  //
- // REQUIRES: ryzen_ai, chess
+ // REQUIRES: ryzen_ai, peano
  //
  // RUN: make -f %S/Makefile clean
  // RUN: make -f %S/Makefile 
diff --git a/programming_guide/section-4/section-4b/Makefile b/programming_guide/section-4/section-4b/Makefile
index 5fc4661b4a..60c81ecc8c 100644
--- a/programming_guide/section-4/section-4b/Makefile
+++ b/programming_guide/section-4/section-4b/Makefile
@@ -26,16 +26,18 @@ build/aie_trace.mlir: ${srcdir}/aie2.py
 
 build/scale.o: ${srcdir}/vector_scalar_mul.cc
 	mkdir -p ${@D}
-	cd ${@D} && xchesscc_wrapper ${CHESSCCWRAP2_FLAGS} -c $< -o ${@F}
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang++ ${PEANOWRAP2_FLAGS} -c $< -o ${@F}
 
 build/final.xclbin: build/aie.mlir build/scale.o
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
+    			--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 				--aie-generate-npu --npu-insts-name=insts.txt $(<:%=../%)
 
 build/trace.xclbin: build/aie_trace.mlir build/scale.o
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
+    			--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
 				--aie-generate-npu --npu-insts-name=insts.txt $(<:%=../%)
 
 ${targetname}.exe: ${srcdir}/test.cpp
diff --git a/programming_guide/section-4/section-4b/run_makefile.lit b/programming_guide/section-4/section-4b/run_makefile.lit
index 9dac5f2247..18e7175198 100644
--- a/programming_guide/section-4/section-4b/run_makefile.lit
+++ b/programming_guide/section-4/section-4b/run_makefile.lit
@@ -1,7 +1,7 @@
 // (c) Copyright 2024 Advanced Micro Devices, Inc.
  // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  //
- // REQUIRES: ryzen_ai, chess
+ // REQUIRES: ryzen_ai, peano 
  //
  // RUN: make -f %S/Makefile clean
  // RUN: make -f %S/Makefile 
diff --git a/utils/build-mlir-aie-from-wheels.sh b/utils/build-mlir-aie-from-wheels.sh
index eb93d4806e..de4f004869 100755
--- a/utils/build-mlir-aie-from-wheels.sh
+++ b/utils/build-mlir-aie-from-wheels.sh
@@ -36,6 +36,12 @@ BUILD_DIR=${2:-"build"}
 INSTALL_DIR=${3:-"install"}
 LLVM_ENABLE_RTTI=${LLVM_ENABLE_RTTI:OFF}
 
+if [ "$#" -ge 4 ]; then
+  PEANO_INSTALL_DIR=`realpath $4`
+  echo "PEANO_INSTALL_DIR DIR: $PEANO_INSTALL_DIR"
+  export PEANO_INSTALL_DIR=${PEANO_INSTALL_DIR}
+fi
+
 mkdir -p $BUILD_DIR
 mkdir -p $INSTALL_DIR
 cd $BUILD_DIR
@@ -56,6 +62,10 @@ CMAKE_CONFIGS="\
     -DAIE_RUNTIME_TARGETS=x86_64 \
     -DAIE_RUNTIME_TEST_TARGET=x86_64 "
 
+if [ "$#" -ge 4 ]; then
+  CMAKE_CONFIGS="${CMAKE_CONFIGS} -DPEANO_INSTALL_DIR=${PEANO_INSTALL_DIR}"
+fi 
+
 if [ -x "$(command -v lld)" ]; then
   CMAKE_CONFIGS="${CMAKE_CONFIGS} -DLLVM_USE_LINKER=lld"
 fi
diff --git a/utils/env_setup.sh b/utils/env_setup.sh
index 6bbb45a765..3b6aee5eee 100755
--- a/utils/env_setup.sh
+++ b/utils/env_setup.sh
@@ -7,23 +7,40 @@
 # 
 ##===----------------------------------------------------------------------===##
 #
-# This script sets up the environment to run the mlir-aie build tools.
+# This script sets up the environment to use mlir-aie tools.
+# The script will also download and set up llvm-aie (peano).
+# 
 #
-# source env_setup.sh <mlir-aie install dir> <llvm install dir>
+# source env_setup.sh <mlir-aie install dir> 
+#                     <llvm install dir> 
+#                     <llvm-aie/peano install dir>
 #
-# e.g. source env_setup.sh /scratch/mlir-aie/install /scratch/llvm/install
+# e.g. source env_setup.sh /scratch/mlir-aie/install 
+#                          /scratch/llvm/install
+#                          /scratch/llvm-aie/install
 #
 ##===----------------------------------------------------------------------===##
 
-if [ "$#" -ne 2 ]; then
+if [ "$#" -lt 2 ]; then
     echo "ERROR: Needs 2 arguments for <mlir-aie install dir> and <llvm install dir>"
     return 1
 fi
 
 export MLIR_AIE_INSTALL_DIR=`realpath $1`
 export LLVM_INSTALL_DIR=`realpath $2`
+if [ "$#" -eq 3 ]; then
+    export PEANO_INSTALL_DIR=`realpath $3`
+fi
 
-export PATH=${MLIR_AIE_INSTALL_DIR}/bin:${LLVM_INSTALL_DIR}/bin:${PATH} 
-export PYTHONPATH=${MLIR_AIE_INSTALL_DIR}/python:${PYTHONPATH} 
-export LD_LIBRARY_PATH=${MLIR_AIE_INSTALL_DIR}/lib:${LLVM_INSTALL_DIR}/lib:${LD_LIBRARY_PATH}
+if [[ $PEANO_INSTALL_DIR == "" ]]; then
+  mkdir -p my_install
+  pushd my_install
+  pip -q download llvm-aie -f https://github.com/Xilinx/llvm-aie/releases/expanded_assets/nightly
+  unzip -q llvm_aie*.whl
+  rm -rf llvm_aie*.whl
+  export PEANO_INSTALL_DIR=`realpath llvm-aie`
+fi
 
+export PATH=${PEANO_INSTALL_DIR}/bin:${MLIR_AIE_INSTALL_DIR}/bin:${LLVM_INSTALL_DIR}/bin:${PATH} 
+export PYTHONPATH=${MLIR_AIE_INSTALL_DIR}/python:${PYTHONPATH} 
+export LD_LIBRARY_PATH=${PEANO_INSTALL_DIR}/bin:${MLIR_AIE_INSTALL_DIR}/lib:${LLVM_INSTALL_DIR}/lib:${LD_LIBRARY_PATH}
\ No newline at end of file
diff --git a/utils/quick_setup.sh b/utils/quick_setup.sh
index e31624a55c..f03f1f457e 100755
--- a/utils/quick_setup.sh
+++ b/utils/quick_setup.sh
@@ -59,15 +59,16 @@ if test -f "$VPP"; then
   unzip -q llvm_aie*.whl
   rm -rf mlir*.whl
   rm -rf llvm_aie*.whl
-  export PATH=`realpath llvm-aie/bin`:`realpath mlir_aie/bin`:`realpath mlir/bin`:$PATH
-  export LD_LIBRARY_PATH=`realpath llvm-aie/lib`:`realpath mlir_aie/lib`:`realpath mlir/lib`:$LD_LIBRARY_PATH
-  export PYTHONPATH=`realpath mlir_aie/python`:$PYTHONPATH
-  export PEANO_DIR=`realpath llvm-aie`
+  export PEANO_INSTALL_DIR=`realpath llvm-aie`
   popd
   python3 -m pip install --upgrade --force-reinstall --no-cache-dir -r python/requirements.txt
   HOST_MLIR_PYTHON_PACKAGE_PREFIX=aie python3 -m pip install --upgrade --force-reinstall --no-cache-dir -r python/requirements_extras.txt
   python3 -m pip install --upgrade --force-reinstall --no-cache-dir -r python/requirements_ml.txt
+  source utils/env_setup.sh my_install/mlir_aie my_install/mlir
   pushd programming_examples
+  echo "PATH              : $PATH"
+  echo "LD_LIBRARY_PATH   : $LD_LIBRARY_PATH"
+  echo "PYTHONPATH        : $PYTHONPATH"
 else
   echo "Vitis not found! Exiting..."
 fi