diff --git a/configure/E3/RULES_REQUIRE b/configure/E3/RULES_REQUIRE
index 9ba5dfbf495b55b5a3651ae5e0d502371653ee67..daf91bf9294bdf14ac8f5f5ac56f05a6452d4122 100644
--- a/configure/E3/RULES_REQUIRE
+++ b/configure/E3/RULES_REQUIRE
@@ -18,6 +18,7 @@ E3_IOC_CFG_FILES := $(TOP)/tools/iocsh_functions
E3_IOC_CFG_FILES += $(E3_ESSENVCFG_FILE)
#E3_IOC_CFG_FILES += $(E3_CONFIG_FILE)
E3_IOC_CFG_FILES += $(TOP)/tools/setE3Env.bash
+E3_IOC_CFG_FILES += $(TOP)/tools/promptE3Env.bash
E3_REQUIRE_CONF_FILES := $(filter-out $(FILE_FILTER), $(wildcard $(TOP)/configure/modules/*))
diff --git a/configure/RELEASE b/configure/RELEASE
index 8cd8274d17b7158e808430561b56eb3e58874901..8c5414bd329073da6b3d268ff2a51bb16cac1f79 100644
--- a/configure/RELEASE
+++ b/configure/RELEASE
@@ -1,4 +1,4 @@
-EPICS_BASE=/epics/base-7.0.3
+EPICS_BASE=/epics/base-7.0.3.1
E3_REQUIRE_NAME:=require
E3_REQUIRE_VERSION:=3.1.2
diff --git a/tools/promptE3Env.bash b/tools/promptE3Env.bash
new file mode 100644
index 0000000000000000000000000000000000000000..58f54bbb6823180b8477c55d4ca0c4d4e2777995
--- /dev/null
+++ b/tools/promptE3Env.bash
@@ -0,0 +1,364 @@
+#!/bin/bash
+#
+# Copyright (c) 2017 - 2019 Jeong Han Lee
+# Copyright (c) 2017 - 2019 European Spallation Source ERIC
+#
+# The program is free software: you can redistribute
+# it and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 2 of the
+# License, or any newer version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program. If not, see https://www.gnu.org/licenses/gpl-2.0.txt
+#
+# Shell : promptE3Env.bash
+# Author : Jeong Han Lee
+# email : jeonghan.lee@gmail.com
+# date : Monday, November 11 22:11:41 CET 2019
+#
+# version : 0.8.1
+#
+#
+
+# the following function drop_from_path was copied from
+# the ROOT build system in ${ROOTSYS}/bin/, and modified
+# a little to return its result
+# Wednesday, July 11 23:19:00 CEST 2018, jhlee
+drop_from_path ()
+{
+ #
+ # Assert that we got enough arguments
+ if test $# -ne 2 ; then
+ echo "drop_from_path: needs 2 arguments"
+ return 1
+ fi
+
+ local p="$1"
+ local drop="$2"
+
+ local new_path=`echo "$p" | sed -e "s;:${drop}:;:;g" \
+ -e "s;:${drop};;g" \
+ -e "s;${drop}:;;g" \
+ -e "s;${drop};;g";`
+ echo ${new_path}
+}
+
+
+set_variable ()
+{
+ if test $# -ne 2 ; then
+ echo "set_variable: needs 2 arguments"
+ return 1
+ fi
+
+ local old_path="$1"
+ local add_path="$2"
+
+ local new_path=""
+ local system_old_path=""
+
+ if [ -z "$old_path" ]; then
+ new_path=${add_path}
+ else
+ system_old_path=$(drop_from_path "${old_path}" "${add_path}")
+ if [ -z "$system_old_path" ]; then
+ new_path=${add_path}
+ else
+ new_path=${add_path}:${system_old_path}
+ fi
+
+ fi
+
+ echo "${new_path}"
+
+}
+
+
+print_env ()
+{
+
+ local disabled="$1";shift;
+
+ if [ "$disabled" = "no_msg" ]; then
+ printf "\n";
+ else
+ printf "\nSet the ESS EPICS Environment as follows:\n";
+ printf "THIS Source NAME : %s\n" "${SRC_NAME}"
+ printf "THIS Source PATH : %s\n" "${SRC_PATH}"
+ printf "EPICS_BASE : %s\n" "${EPICS_BASE}"
+ printf "EPICS_HOST_ARCH : %s\n" "${EPICS_HOST_ARCH}"
+ printf "E3_REQUIRE_LOCATION : %s\n" "${E3_REQUIRE_LOCATION}"
+ printf "PATH : %s\n" "${PATH}"
+ printf "LD_LIBRARY_PATH : %s\n" "${LD_LIBRARY_PATH}"
+ printf "\n";
+ printf "Enjoy E3!\n";
+ fi
+}
+
+# Reset all EPICS, E3, and EEE related PRE-EXIST VARIABLES
+# Remove them from PATH and LD_LIBRARY_PATH
+#
+# If EPICS_BASE is defined,
+# 1) Remove EPICS_BASE bin in the system PATH
+# 2) Remove EPICS_BASE lib in the system LD_LIBRARY_PATH
+# 3) Unset EPICS_BASE, EPICS_HOST_ARCH, and so on
+if [ -n "$EPICS_BASE" ]; then
+
+ system_path=${PATH}
+ drop_base_path="${EPICS_BASE}/bin/${EPICS_HOST_ARCH}"
+
+ PATH=$(drop_from_path "${system_path}" "${drop_base_path}")
+ export PATH
+
+ system_ld_path=${LD_LIBRARY_PATH}
+ drop_ld_path="${EPICS_BASE}/lib/${EPICS_HOST_ARCH}"
+
+ LD_LIBRARY_PATH=$(drop_from_path "${system_ld_path}" "${drop_ld_path}")
+ export LD_LIBRARY_PATH
+
+ # If EPICS_ENTENSIONS, it is epics_builder
+ if [ -n "$EPICS_EXTENSIONS" ]; then
+ ext_path=${PATH}
+ drop_ext_path="${EPICS_EXTENSIONS}/bin/${EPICS_HOST_ARCH}"
+
+ PATH=$(drop_from_path "${ext_path}" "${drop_ext_path}")
+ export PATH
+
+ unset EPICS_EXTENSIONS
+ unset EPICS_PATH
+ unset EPICS_MODULES
+ unset EPICS_EXTENSIONS
+ unset EPICS_AREADETECTOR
+ unset EPICS_APPS
+ fi
+
+ # If E3_REQUIRE_NAME, it is E3
+ if [ -n "$E3_REQUIRE_NAME" ]; then
+
+ e3_path=${PATH}
+
+ PATH=$(drop_from_path "${e3_path}" "${E3_REQUIRE_BIN}")
+ export PATH
+
+
+ # If CONDA_EXE, it is trouble to find the correct tclsh
+ if [ -n "$CONDA_EXE" ]; then
+
+ # Decouple PATH from ESS Conda Env1 due to tclsh
+ ess_conda_path1=${PATH}
+ drop_ess_conda_path1="/opt/conda/envs/python37/bin"
+ PATH=$(drop_from_path "${ess_conda_path1}" "${drop_ess_conda_path1}")
+ export PATH
+
+ # Decouple PATH from ESS Conda Env2 due to tclsh
+ ess_conda_path2=${PATH}
+ drop_ess_conda_path2="/opt/conda/condabin"
+ PATH=$(drop_from_path "${ess_conda_path2}" "${drop_ess_conda_path2}")
+ export PATH
+
+ fi
+
+
+ e3_ld_path=${LD_LIBRARY_PATH}
+ drop_e3_ld_path1="${E3_REQUIRE_LIB}/${EPICS_HOST_ARCH}"
+ drop_e3_ld_path2="${E3_SITELIBS_PATH}/${EPICS_HOST_ARCH}"
+ e3_ld_path_0=$(drop_from_path "${e3_ld_path}" "${drop_e3_ld_path1}")
+
+ LD_LIBRARY_PATH=$(drop_from_path "${e3_ld_path_0}" "${drop_e3_ld_path2}")
+ export LD_LIBRARY_PATH
+
+ unset E3_REQUIRE_NAME
+ unset E3_REQUIRE_VERSION
+ unset E3_REQUIRE_LOCATION
+
+ unset E3_REQUIRE_BIN
+ unset E3_REQUIRE_LIB
+ unset E3_REQUIRE_INC
+ unset E3_REQUIRE_DB
+
+ unset E3_SITEMODS_PATH
+ unset E3_SITELIBS_PATH
+ unset E3_SITEAPPS_PATH
+
+ unset EPICS_DRIVER_PATH
+
+ unset SCRIPT_DIR
+
+ fi
+
+
+
+ # If EPICS_ENV_PATH, it is EEE
+ if [ -n "$EPICS_ENV_PATH" ]; then
+
+ # Decouple PATH from EPICS_ENV_PATH
+ eee_path=${PATH}
+ PATH=$(drop_from_path "${eee_path}" "${EPICS_ENV_PATH}")
+ export PATH
+
+ # Decouple PATH from pvAccessCPP
+ eee_pvaccess_path=${PATH}
+ drop_eee_pvaccess_path="${EPICS_MODULES_PATH}/pvAccessCPP/5.0.0/${BASE}/bin/${EPICS_HOST_ARCH}"
+ PATH=$(drop_from_path "${eee_pvaccess_path}" "${drop_eee_pvaccess_path}")
+ export PATH
+
+ # Decouple PYTHONPATH from pyaPy
+ eee_python_path=${PYTHONPATH}
+ drop_eee_python_path="${EPICS_MODULES_PATH}/pvaPy/0.6.0/${BASE}/lib/${EPICS_HOST_ARCH}"
+ PYTHONPATH=$(drop_from_path "${eee_python_path}" "${drop_eee_python_path}")
+ export PYTHONPATH
+
+
+ # Unset all unique EEE variables
+ unset BASE
+ unset EPICS_BASES_PATH
+ unset EPICS_DB_INCLUDE_PATH
+ unset EPICS_MODULES_PATH
+ unset EPICS_ENV_PATH
+ fi
+
+ unset EPICS_BASE
+ unset EPICS_HOST_ARCH
+
+fi
+
+
+
+THIS_SRC=${BASH_SOURCE[0]:-${0}}
+
+
+if [ -L $THIS_SRC ]; then
+ SRC_PATH="$( cd -P "$( dirname $(readlink -f "$THIS_SRC") )" && pwd )"
+else
+ SRC_PATH="$( cd -P "$( dirname "$THIS_SRC" )" && pwd )"
+fi
+
+SRC_NAME=${THIS_SRC##*/}
+
+
+# e3.cfg will be generated via make e3-site-conf
+# The Global Variables are defined in configure/E3/DEFINES_REQUIRE
+# RULES is defined in configure/E3/RULES_REQUIRE
+#
+# Dynamic Changes according to the time when one installs REQUIRE
+#
+# declare -g DEFAULT_EPICS_BASE=/epics/base-3.15.5
+# declare -g DEFAULT_REQUIRE_NAME=require
+# declare -g DEFAULT_REQUIRE_VERSION=3.0.0
+
+GENERATED_E3_CFG=$SRC_PATH/e3.cfg
+
+
+# don't install e3.cfg when make install is executed,
+# so all varaibles are found according to the existent location
+# the symbolic link path doesn't work
+#
+if [ ! -f ${GENERATED_E3_CFG} ]; then
+
+ e3_REQUIRE_BIN_NAME=${SRC_PATH##*/}
+ E3_REQUIRE_LOCATION=${SRC_PATH%/*}
+ E3_REQUIRE_VERSION=${E3_REQUIRE_LOCATION##*/}
+ e3_REQUIRE_PATH=${E3_REQUIRE_LOCATION%/*}
+ E3_REQUIRE_NAME=${e3_REQUIRE_PATH##*/}
+ EPICS_BASE=${e3_REQUIRE_PATH%/*}
+
+else
+
+ # in e3-require/tools
+ # in case, source within e3-require
+ set -a
+ source $GENERATED_E3_CFG
+ set +a
+
+ EPICS_BASE=${DEFAULT_EPICS_BASE}
+ E3_REQUIRE_NAME=${DEFAULT_REQUIRE_NAME}
+ E3_REQUIRE_VERSION=${DEFAULT_REQUIRE_VERSION}
+ E3_REQUIRE_LOCATION=${EPICS_BASE}/${E3_REQUIRE_NAME}/${E3_REQUIRE_VERSION}
+
+fi
+
+epics_host_arch_file="${EPICS_BASE}/startup/EpicsHostArch.pl"
+if [ -e "$epics_host_arch_file" ]; then
+ EPICS_HOST_ARCH=$("${EPICS_BASE}/startup/EpicsHostArch.pl")
+else
+ EPICS_HOST_ARCH=$(perl ${EPICS_BASE}/lib/perl/EpicsHostArch.pl)
+fi
+
+
+
+E3_REQUIRE_BIN=${E3_REQUIRE_LOCATION}/bin
+E3_REQUIRE_LIB=${E3_REQUIRE_LOCATION}/lib
+E3_REQUIRE_INC=${E3_REQUIRE_LOCATION}/include
+E3_REQUIRE_DB=${E3_REQUIRE_LOCATION}/db
+E3_REQUIRE_DBD=${E3_REQUIRE_LOCATION}/dbd
+
+
+E3_SITEMODS_PATH=${E3_REQUIRE_LOCATION}/siteMods
+E3_SITELIBS_PATH=${E3_REQUIRE_LOCATION}/siteLibs
+E3_SITEAPPS_PATH=${E3_REQUIRE_LOCATION}/siteApps
+
+
+if [ -n "${SITE_SYSTEMAPPS_PATH}" ]; then
+ EPICS_DRIVER_PATH=${E3_SITEMODS_PATH}:${E3_SITEAPPS_PATH}:${SITE_SYSTEMAPPS_PATH}
+else
+ EPICS_DRIVER_PATH=${E3_SITEMODS_PATH}:${E3_SITEAPPS_PATH}
+fi
+
+
+export EPICS_BASE
+export E3_REQUIRE_NAME
+export E3_REQUIRE_VERSION
+
+export EPICS_HOST_ARCH
+export E3_REQUIRE_LOCATION
+
+export E3_REQUIRE_BIN
+export E3_REQUIRE_LIB
+export E3_REQUIRE_INC
+export E3_REQUIRE_DB
+export E3_REQUIRE_DBD
+
+export E3_SITEMODS_PATH
+export E3_SITELIBS_PATH
+export E3_SITEAPPS_PATH
+
+export EPICS_DRIVER_PATH
+
+
+old_path=${PATH}
+E3_PATH="${E3_REQUIRE_BIN}:${EPICS_BASE}/bin/${EPICS_HOST_ARCH}"
+
+PATH=$(set_variable "${old_path}" "${E3_PATH}")
+
+# # We have a problem, if we have the multiple versions of one module, we have the same executable file names.
+# # "echo" selects the lower version number by default. And if the version is used with a string,
+# # we don't rely upon echo result.
+# # Rethink how we handle each binary files within a module
+# #
+# E3_SITELIBS_BINS=`echo ${E3_SITELIBS_PATH}/*_bin`;
+
+# for each_bins in ${E3_SITELIBS_BINS}; do
+# PATH="${PATH}:$each_bins/${EPICS_HOST_ARCH}"
+# # echo $each_bins
+# done
+
+export PATH
+
+old_ld_path=${LD_LIBRARY_PATH}
+E3_LD_LIBRARY_PATH="${EPICS_BASE}/lib/${EPICS_HOST_ARCH}:${E3_REQUIRE_LIB}/${EPICS_HOST_ARCH}:${E3_SITELIBS_PATH}/${EPICS_HOST_ARCH}"
+
+LD_LIBRARY_PATH=$(set_variable "${old_ld_path}" "${E3_LD_LIBRARY_PATH}")
+export LD_LIBRARY_PATH
+
+
+IFS='-' read -ra base <<< "$EPICS_BASE"
+PS1=(EPICS-${base[1]})$PS1
+
+
+print_env "$1"
+