diff --git a/bin/bootstrap_epics b/bin/bootstrap_epics
index 4592e137e979e002ec4a790018340e7792b5fd74..85d5d3f97c334c6aea5e8244544708d03d95625f 100755
--- a/bin/bootstrap_epics
+++ b/bin/bootstrap_epics
@@ -1,6 +1,6 @@
 #!/bin/bash
 #set -o nounset
-set -o errexit
+#set -o errexit
 
 function print_the_help {
   echo "USAGE: bootstrap_epics "
@@ -136,31 +136,45 @@ source setup.sh
 #
 #popd
 
-######################
-# Extensions
-git clone https://github.com/epics-extensions/extensions
+yes_or_no "Build extenstions"
+if [[ "$?"  ]] ; then 
+  # Extensions
+  git clone https://github.com/epics-extensions/extensions
 
-pushd extensions/src
-git clone https://github.com/mdavidsaver/pyDevSup.git
-pushd pyDevSup
-sed -i '26d' configure/RELEASE
-sed -i '26iINSTALL_LOCATION=/opt/epics/extensions' configure/RELEASE
-sed -i '39d' configure/RELEASE
-sed -i '39iEPICS_BASE = /opt/epics/base' configure/RELEASE
-popd 
-popd
+  pushd extensions/src
+  git clone https://github.com/mdavidsaver/pyDevSup.git
+  pushd pyDevSup
+  sed -i '26d' configure/RELEASE
+  sed -i '26iINSTALL_LOCATION=/opt/epics/extensions' configure/RELEASE
+  sed -i '39d' configure/RELEASE
+  sed -i '39iEPICS_BASE = /opt/epics/base' configure/RELEASE
+  popd 
+  popd
 
 
-pushd extensions
-sed -i '65iPYDEVSUP = pyDevSup' src/Makefile
-sed -i '127iDIRS += $(PYDEVSUP)' src/Makefile
+  pushd extensions
+  sed -i '65iPYDEVSUP = pyDevSup' src/Makefile
+  sed -i '127iDIRS += $(PYDEVSUP)' src/Makefile
 
-sed -i '26d' src/pyDevSup/configure/CONFIG_SITE
-sed -i '26iINSTALL_LOCATION=/opt/epics/extensions' src/pyDevSup/configure/CONFIG_SITE
+  sed -i '26d' src/pyDevSup/configure/CONFIG_SITE
+  sed -i '26iINSTALL_LOCATION=/opt/epics/extensions' src/pyDevSup/configure/CONFIG_SITE
+  sed -i '15iinclude /opt/epics/extensions/configure/os/CONFIG_PY.Common.$(EPICS_HOST_ARCH)' src/pyDevSup/configure/CONFIG_PY
 
-make 
-popd
+  make 
+  popd
 
+fi
 
+yes_or_no "caQtDM"
+if [[ $?  ]] ; then 
 
+  pushd extensions/src
+  wget https://github.com/caqtdm/caqtdm/archive/V4.2.4.tar.gz -O - | tar -zx
+  pushd caqtdm-4.2.4
+  ./caQtDM_BuildAll
+  ./caQtDM_Install
+  popd
+  popd
+
+fi