diff --git a/README.md b/README.md
index c8f43db..a73c0cb 100644
--- a/README.md
+++ b/README.md
@@ -68,15 +68,12 @@
 | `WITH_BBSIM`                    | no                           | Should the BBSIM POD be deployed?                                                   |
 | `WITH_ONOS`                     | yes                          | Should `ONOS` service be deployed?                                                  |
 | `WITH_RADIUS`                   | no                           | Should `freeradius` service be deployed?                                            |
-| `WITH_TP`                       | yes                          | Install the ONOS image that support Tech Profiles                                   |
 | `WITH_TIMINGS`                  | no                           | Outputs duration of various steps of the install                                    |
 | `CONFIG_SADIS`                  | no                           | Configure SADIS entries into ONOS, if WITH_ONOS set (see SADIS Configuration        |    
 | `INSTALL_ONOS_APPS`             | no                           | Replaces/installs ONOS OAR files in onos-files/onos-apps                            |
 | `SKIP_RESTART_API`              | no                           | Should the VOLTHA API service be restarted after install to avoid known bug?        |
 | `INSTALL_KUBECTL`               | yes                          | Should a copy of `kubectl` be installed locally?                                    |
 | `INSTALL_HELM`                  | yes                          | Should a copy of `helm` be installed locallly?                                      |
-| `USE_GO`                        | yes                          | Should the Go[lang] version of the OpenOLT adapter be used?                         |
-| `ONOS_TAG`                      |                              | Used to override the default image tag for the ONOS docker image                    |
 | `VOLTHA_LOG_LEVEL`              | WARN                         | Log level to set for VOLTHA core processes                                          |
 | `VOLTHA_CHART`                  | onf/voltha                   | Helm chart to used to install voltha                                                |
 | `VOLTHA_ADAPTER_SIM_CHART`      | onf/voltha-adapter-simulated | Helm chart to use to install simulated device adapter                               |
@@ -205,12 +202,6 @@
 	--data @<selected SADIS configuration file>
 ```
 
-When using the `voltha up` script, if you specify `WITH_ONOS=yes` and `CONFIG_SADIS=yes`
-then the script will deploy a SADIS configuration based on the setting of `WITH_TP`. If
-you would like to deploy a custom SADIS configuration then you can place that in the
-file `onos-file/onos-sadis.json` and it will be used instead of the default SADIS
-configuration files.
-
 ## Install VOLTHA Core
 VOLTHA has two main _parts_: core and adapters. The **core** provides the main
 logic for the VOLTHA application and the **adapters** contain logic to adapter
diff --git a/full-values.yaml b/full-values.yaml
index dbf23d6..dca70d9 100644
--- a/full-values.yaml
+++ b/full-values.yaml
@@ -12,21 +12,71 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-defaults:
-  image_tag: master
-  image_pullPolicy: Always
+# IMAGE SELECTION
+# ---------------
+# By default no defaults are set and the image tags specified in the helm
+# charts will be used. If you would like to use the images generated from the
+# HEAD of the "master" git branches, then uncomment this below block and
+# set "<VALUE>" to "master". Similarly, if you want to use the images 
+# generated from the HEAD of the "voltha-2.1" git branches, then uncomment
+# this block and replace "<VALUE>" with "voltha-2.1".
+#defaults:
+#  image_tag: <VALUE>
 
 images:
-  adapter_open_olt:
-    tag_go: master
-    pullPolicy: Always
   onos:
-    tag: master
     repository: voltha/voltha-onos
-    pullPolicy: Always
-  bbsim:
-    tag: master
-    pullPolicy: Always
+    # IMAGE_SELECTION
+    # ---------------
+    # The helm chart used to deploy ONOS is the public ONOS helm chart so,
+    # there is a need to specify the exact image repository and image tag.
+    # If you would like to use the "master", "voltha-2.1", or other image 
+    # just replace the "tag" value below.
+    tag: 2.1.0
+
+# IMAGE_SELECTION
+# ---------------
+# Below are a list of all the images utilized by kind-voltha. This list is
+# provided as a conveinence if you would like to override on a per image
+# basis. If you are using the defaults, master, or voltha-2.1 branch there
+# is no need to utilize this list.
+#images:
+#  onos:
+#    repositry: voltha/voltha-onos
+#    tag: 2.1.0
+#  adapter_open_olt:
+#    repositry: voltha/voltha-openolt-adapter
+#    tag: 2.1.1
+#  adapter_open_onu:
+#    repositry: voltha/voltha-openonu-adapter
+#    tag: 2.1.0
+#  adapter_simulated_olt:
+#    repositry: voltha/voltha-adapter-simulated-olt
+#    tag: 2.1.1
+#  adapter_simulated_olt:
+#    repositry: voltha/voltha-adapter-simulated-onu
+#    tag: 2.1.1
+#  bbsim:
+#    repositry: voltha/voltha-bbsim
+#    tag: 2.1.0
+#  afrouter:
+#    repositry: voltha/voltha-afrouter
+#    tag: 2.1.1
+#  afrouterd:
+#    repositry: voltha/voltha-afrouterd
+#    tag: 2.1.1
+#  cli:
+#    repositry: voltha/voltha-cli
+#    tag: 2.1.1
+#  ofagent:
+#    repositry: voltha/voltha-ofagent
+#    tag: 2.1.1
+#  ro_core:
+#    repositry: voltha/voltha-ro-core
+#    tag: 2.1.1
+#  rw_core:
+#    repositry: voltha/voltha-rw-core
+#    tag: 2.1.1
 
 onos_env:
 - name: POD_IP
@@ -42,4 +92,3 @@
 
 # Customization for BBSIM
 kafka_broker: 'voltha-kafka.voltha.svc.cluster.local:9092'
-
diff --git a/minimal-values.yaml b/minimal-values.yaml
index 7708ade..985f4e9 100644
--- a/minimal-values.yaml
+++ b/minimal-values.yaml
@@ -12,21 +12,71 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-defaults:
-  image_tag: master
-  image_pullPolicy: Always
+# IMAGE SELECTION
+# ---------------
+# By default no defaults are set and the image tags specified in the helm
+# charts will be used. If you would like to use the images generated from the
+# HEAD of the "master" git branches, then uncomment this below block and
+# set "<VALUE>" to "master". Similarly, if you want to use the images 
+# generated from the HEAD of the "voltha-2.1" git branches, then uncomment
+# this block and replace "<VALUE>" with "voltha-2.1".
+#defaults:
+#  image_tag: <VALUE>
 
 images:
-  adapter_open_olt:
-    tag_go: master
-    pullPolicy: Always
   onos:
-    tag: master
     repository: voltha/voltha-onos
-    pullPolicy: Always
-  bbsim:
-    tag: master
-    pullPolicy: Always
+    # IMAGE_SELECTION
+    # ---------------
+    # The helm chart used to deploy ONOS is the public ONOS helm chart so,
+    # there is a need to specify the exact image repository and image tag.
+    # If you would like to use the "master", "voltha-2.1", or other image 
+    # just replace the "tag" value below.
+    tag: 2.1.0
+
+# IMAGE_SELECTION
+# ---------------
+# Below are a list of all the images utilized by kind-voltha. This list is
+# provided as a conveinence if you would like to override on a per image
+# basis. If you are using the defaults, master, or voltha-2.1 branch there
+# is no need to utilize this list.
+#images:
+#  onos:
+#    repositry: voltha/voltha-onos
+#    tag: 2.1.0
+#  adapter_open_olt:
+#    repositry: voltha/voltha-openolt-adapter
+#    tag: 2.1.1
+#  adapter_open_onu:
+#    repositry: voltha/voltha-openonu-adapter
+#    tag: 2.1.0
+#  adapter_simulated_olt:
+#    repositry: voltha/voltha-adapter-simulated-olt
+#    tag: 2.1.1
+#  adapter_simulated_olt:
+#    repositry: voltha/voltha-adapter-simulated-onu
+#    tag: 2.1.1
+#  bbsim:
+#    repositry: voltha/voltha-bbsim
+#    tag: 2.1.0
+#  afrouter:
+#    repositry: voltha/voltha-afrouter
+#    tag: 2.1.1
+#  afrouterd:
+#    repositry: voltha/voltha-afrouterd
+#    tag: 2.1.1
+#  cli:
+#    repositry: voltha/voltha-cli
+#    tag: 2.1.1
+#  ofagent:
+#    repositry: voltha/voltha-ofagent
+#    tag: 2.1.1
+#  ro_core:
+#    repositry: voltha/voltha-ro-core
+#    tag: 2.1.1
+#  rw_core:
+#    repositry: voltha/voltha-rw-core
+#    tag: 2.1.1
 
 deployments:
   etcdOperator: true
diff --git a/onos-files/onos-sadis-no-tp.json b/onos-files/onos-sadis-no-tp.json
deleted file mode 100644
index 1208325..0000000
--- a/onos-files/onos-sadis-no-tp.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-      "sadis": {
-        "integration": {
-          "cache": {
-            "enabled": false,
-            "maxsize": 50,
-            "ttl": "PT0m"
-          }
-        },
-        "entries": [
-          {
-            "id": "BBSIMOLT000",
-            "hardwareIdentifier": "0f:f1:ce:c0:ff:ee",
-            "nasId": "BBSIMOLT000",
-            "uplinkPort": 65536
-          },
-          {
-            "id": "BBSM00000001-1",
-            "cTag": 900,
-            "sTag": 900,
-            "nasPortId": "BBSM00000001-1",
-            "circuitId": "BBSM00000001-1",
-            "remoteId": "BBSIMOLT000"
-          }
-        ]
-      }
-    }
-  }
-}
diff --git a/onos-files/onos-sadis-tp.json b/onos-files/onos-sadis-sample.json
similarity index 100%
rename from onos-files/onos-sadis-tp.json
rename to onos-files/onos-sadis-sample.json
diff --git a/voltha b/voltha
index c855c1f..28d0ea0 100755
--- a/voltha
+++ b/voltha
@@ -73,19 +73,24 @@
 WITH_ONOS=${WITH_ONOS:-yes}
 CONFIG_SADIS=${CONFIG_SADIS:-no}
 INSTALL_ONOS_APPS=${INSTALL_ONOS_APPS:-no}
-WITH_TP=${WITH_TP:-yes}
 JUST_K8S=${JUST_K8S:-no}
 DEPLOY_K8S=${DEPLOY_K8S:-yes}
 SKIP_RESTART_API=${SKIP_RESTART_API:-no}
 INSTALL_KUBECTL=${INSTALL_KUBECTL:-yes}
 INSTALL_HELM=${INSTALL_HELM:-yes}
-USE_GO=${USE_GO:-yes}
 WAIT_ON_DOWN=${WAIT_ON_DOWN:-no}
 VOLTHA_LOG_LEVEL=${VOLTHA_LOG_LEVEL:-WARN}
-VOLTHA_CHART=${VOLTHA_CHART:=onf/voltha}
+VOLTHA_CHART=${VOLTHA_CHART:-onf/voltha}
+VOLTHA_CHART_VERSION=${VOLTHA_CHART_VERSION:-latest}
+VOLTHA_BBSIM_CHART=${VOLTHA_BBSIM_CHART:-onf/bbsim}
+VOLTHA_BBSIM_CHART_VERSION=${VOLTHA_BBSIM_CHART_VERSION:-latest}
 VOLTHA_ADAPTER_SIM_CHART=${VOLTHA_ADAPTER_SIM_CHART:-onf/voltha-adapter-simulated}
+VOLTHA_ADAPTER_SIM_CHART_VERSION=${VOLTHA_ADAPTER_SIM_CHART_VERSION:-latest}
 VOLTHA_ADAPTER_OPEN_OLT_CHART=${VOLTHA_ADAPTER_OPEN_OLT_CHART:-onf/voltha-adapter-openolt}
+VOLTHA_ADAPTER_OPEN_OLT_CHART_VERSION=${VOLTHA_ADAPTER_OPEN_OLT_CHART_VERSION:-latest}
 VOLTHA_ADAPTER_OPEN_ONU_CHART=${VOLTHA_ADAPTER_OPEN_ONU_CHART:-onf/voltha-adapter-openonu}
+VOLTHA_ADAPTER_OPEN_ONU_CHART_VERSION=${VOLTHA_ADAPTER_OPEN_ONU_CHART_VERSION:-latest}
+
 
 HAVE_GO=$(which go >/dev/null 2>&1 && echo "yes" || echo "no")
 HOSTOS=$(uname -s | tr "[:upper:]" "[:lower:"])
@@ -123,7 +128,6 @@
     WITH_BBSIM \
     WITH_RADIUS \
     WITH_ONOS \
-    WITH_TP \
     CONFIG_SADIS \
     JUST_K8S \
     DEPLOY_K8S \
@@ -131,7 +135,6 @@
     SKIP_RESTART_API \
     INSTALL_KUBECTL \
     INSTALL_HELM \
-    USE_GO \
     WAIT_ON_DOWN \
     "
 
@@ -141,10 +144,15 @@
     $ALL_YES_NO \
     VOLTHA_LOG_LEVEL \
     VOLTHA_CHART \
+    VOLTHA_CHART_VERSION \
+    VOLTHA_BBSIM_CHART \
+    VOLTHA_BBSIM_CHART_VERSION \
     VOLTHA_ADAPTER_SIM_CHART \
+    VOLTHA_ADAPTER_SIM_CHART_VERSION \
     VOLTHA_ADAPTER_OPEN_OLT_CHART \
+    VOLTHA_ADAPTER_OPEN_OLT_CHART_VERSION \
     VOLTHA_ADAPTER_OPEN_ONU_CHART \
-    ONOS_TAG \
+    VOLTHA_ADAPTER_OPEN_ONU_CHART_VERSION \
     ONOS_API_PORT \
     ONOS_SSH_PORT \
     VOLTHA_API_PORT \
@@ -160,13 +168,6 @@
     fi
 done
 
-# Convert USE_GO from yes/no to true/false for helm chart usage
-if [ "$USE_GO" == "yes" ]; then
-    USE_GO=true
-else
-    USE_GO=false
-fi
-
 mkdir -p .voltha
 touch .voltha/ports
 HAVE=$(grep $NAME .voltha/ports)
@@ -200,10 +201,6 @@
 cp $PORTTMP .voltha/ports
 rm -f $PORTTMP
 
-ONOS_TAG=${ONOS_TAG:-}
-if [ "$WITH_TP" == "yes" -a "$ONOS_TAG X" == " X" ]; then
-    ONOS_TAG="voltha-1.7"
-fi
 export ONOS_API_PORT ONOS_SSH_PORT
 
 IDX=1
@@ -619,9 +616,6 @@
 echo "OPTIONS" >> $LOG
 for O in $ALL_OPTIONS; do
     VAL=$(eval echo \$$O)
-    if [ $O == "USE_GO" ]; then
-        VAL="$(echo $VAL| test $(grep -c true) -eq 1 && echo yes || echo no)"
-    fi
     if [ ! -z "$VAL" ]; then
         printf "    %-30s = %s\n" $O $VAL >> $LOG
     fi
@@ -635,17 +629,25 @@
     local NAMESPACE=$1; shift
     local INAME=$1; shift
     local CHART=$1; shift
+    local CHART_VERSION=$1; shift
     local MESSAGE=$*
 
+    echo "CHART_VERSION=\"$CHART_VERSION\""
+    if [ "$CHART_VERSION X" != " X" -a "$CHART_VERSION" != "latest" ]; then
+        CHART_VERSION="--version $CHART_VERSION"
+    else
+        CHART_VERSION=
+    fi
+
     COUNT=$(expr 300 / 15)
     bspin $INDENT $MESSAGE
-    (set -x; helm install -f $NAME-values.yaml --set use_go=$USE_GO --set defaults.log_level=$VOLTHA_LOG_LEVEL --namespace $NAMESPACE --name $INAME $EXTRA_HELM_FLAGS $CHART >>$LOG 2>&1) >>$LOG 2>&1
+    (set -x; helm install -f $NAME-values.yaml --set defaults.log_level=$VOLTHA_LOG_LEVEL --namespace $NAMESPACE --name $INAME $CHART_VERSION $EXTRA_HELM_FLAGS $CHART >>$LOG 2>&1) >>$LOG 2>&1
     SUCCESS=$?
     while [ $SUCCESS -ne 0 ]; do
         sspin $INDENT
         COUNT=$(expr $COUNT - 1)
         if [ $COUNT -eq 0 ]; then
-            (set -x; helm install -f $NAME-values.yaml --set use_go=$USE_GO --set defaults.log_level=$VOLTHA_LOG_LEVEL --namespace $NAMESPACE --name $INAME $EXTRA_HELM_FLAGS $CHART >>$LOG 2>&1) >>$LOG 2>&1
+            (set -x; helm install -f $NAME-values.yaml --set defaults.log_level=$VOLTHA_LOG_LEVEL --namespace $NAMESPACE --name $INAME $CHART_VERSION $EXTRA_HELM_FLAGS $CHART >>$LOG 2>&1) >>$LOG 2>&1
             COUNT=$(expr 300 / 15)
         fi
         sleep .15
@@ -871,7 +873,7 @@
 bspin "Verify ETCD Operator $OLD_KEY"
 if [ $(helm list --deployed --short --namespace voltha "^etcd-operator\$" | wc -l) -ne 1 ]; then
     espin $NOT_VERIFIED 
-    helm_install - voltha etcd-operator stable/etcd-operator "Install ETCD Operator"
+    helm_install - voltha etcd-operator stable/etcd-operator latest "Install ETCD Operator"
 else
     espin $VERIFIED
 fi
@@ -886,11 +888,7 @@
     bspin "Verify ONOS installed $BIRD"
     if [ $(helm list --deployed --short --namespace default "^onos\$" | wc -l) -ne 1 ]; then
         espin $NOT_VERIFIED
-        SET_TAG=
-        if [ "$ONOS_TAG X" != " X" ]; then
-            SET_TAG="--set images.onos.tag=$ONOS_TAG"
-        fi
-        EXTRA_HELM_FLAGS="$SET_TAG $EXTRA_HELM_FLAGS" helm_install - default onos onf/onos "Install ONOS"
+        EXTRA_HELM_FLAGS="$SET_TAG $EXTRA_HELM_FLAGS" helm_install - default onos onf/onos latest "Install ONOS"
     else
         espin $VERIFIED
     fi
@@ -912,7 +910,7 @@
     espin - $VERIFIED
     bspin - "Verify or download ONOS configuration support files $DOWNLOAD"
     ONOS_FILES="olt-onos-enableExtraneousRules.json  olt-onos-olt-settings.json onos-aaa.json \
-        onos-dhcpl2relay.json onos-kafka.json onos-sadis-no-tp.json onos-sadis-tp.json"
+        onos-dhcpl2relay.json onos-kafka.json onos-sadis-sample.json"
     (set -x; mkdir -p ./onos-files  >>$LOG 2>&1) >>$LOG 2>&1
     for i in $ONOS_FILES; do
         if [ ! -r ./onos-files/$i ]; then
@@ -941,10 +939,7 @@
     if [ -f onos-files/onos-sadis.json ]; then
         push_onos_config "[optional] Push ONOS SADIS Configuration" "network/configuration/apps/org.opencord.sadis" "onos-files/onos-sadis.json"
     elif [ "$CONFIG_SADIS" == "yes" ]; then
-        SADIS_CFG=onos-files/onos-sadis-no-tp.json
-        if [ "$WITH_TP" == "yes" ]; then
-            SADIS_CFG=onos-files/onos-sadis-tp.json
-        fi
+        SADIS_CFG=onos-files/onos-sadis-sample.json
         push_onos_config "[optional] Push ONOS SADIS Configuration" "network/configuration/apps/org.opencord.sadis" "$SADIS_CFG"
     fi
 fi
@@ -956,12 +951,12 @@
 bspin "Verify VOLTHA installed $HIGH_VOLTAGE"
 if [ $(helm list --deployed --short --namespace voltha "^voltha\$" | wc -l) -ne 1 ]; then
     espin $NOT_VERIFIED
-    helm_install - voltha voltha $VOLTHA_CHART "Install VOLTHA Core"
+    helm_install - voltha voltha $VOLTHA_CHART $VOLTHA_CHART_VERSION "Install VOLTHA Core"
 else
     espin $VERIFIED
 fi
 
-VOLTHA="ofagent-.* \
+VOLTHA="voltha-ofagent-.* \
     ro-core.* \
     rw-core.* \
     voltha-api-server-.* \
@@ -980,7 +975,7 @@
 bspin - "Verify Simulated Adapters installed"
 if [ $(helm list --deployed --short --namespace voltha "^sim\$" | wc -l) -ne 1 ]; then
     espin - $NOT_VERIFIED
-    helm_install - voltha sim $VOLTHA_ADAPTER_SIM_CHART "Install Simulated Adapters"
+    helm_install - voltha sim $VOLTHA_ADAPTER_SIM_CHART $VOLTHA_ADAPTER_SIM_CHART_VERSION "Install Simulated Adapters"
 else
     espin - $VERIFIED
 fi
@@ -988,14 +983,14 @@
 bspin - "Verify OpenOLT Adapter installed"
 if [ $(helm list --deployed --short --namespace voltha "^open-olt\$" | wc -l) -ne 1 ]; then
     espin - $NOT_VERIFIED
-    helm_install - voltha open-olt $VOLTHA_ADAPTER_OPEN_OLT_CHART "Install OpenOLT Adapter"
+    helm_install - voltha open-olt $VOLTHA_ADAPTER_OPEN_OLT_CHART $VOLTHA_ADAPTER_OPEN_OLT_CHART_VERSION "Install OpenOLT Adapter"
 else
     espin - $VERIFIED
 fi
 bspin - "Verify OpenONU Adapter installed"
 if [ $(helm list --deployed --short --namespace voltha "^open-onu\$" | wc -l) -ne 1 ]; then
     espin - $NOT_VERIFIED
-    helm_install - voltha open-onu $VOLTHA_ADAPTER_OPEN_ONU_CHART "Install OpenONU Adapter"
+    helm_install - voltha open-onu $VOLTHA_ADAPTER_OPEN_ONU_CHART $VOLTHA_ADAPTER_OPEN_ONU_CHART_VERSION "Install OpenONU Adapter"
 else
     espin - $VERIFIED
 fi
@@ -1012,7 +1007,7 @@
     bspin - "Verify BBSIM Installed"
     if [ $(helm list --deployed --short --namespace voltha "^bbsim\$" | wc -l) -ne 1 ]; then
         espin - $NOT_VERIFIED
-        helm_install - voltha bbsim onf/bbsim "Install BBSIM"
+        helm_install - voltha bbsim $VOLTHA_BBSIM_CHART $VOLTHA_BBSIM_CHART_VERSION "Install BBSIM"
     else
         espin - $VERIFIED
     fi
@@ -1028,7 +1023,7 @@
     bspin - "Verify RADIUS Installed"
     if [ $(helm list --deployed --short --namespace voltha "^radius\$" | wc -l) -ne 1 ]; then
         espin - $NOT_VERIFIED
-        helm_install - voltha radius onf/freeradius "Install RADIUS"
+        helm_install - voltha radius onf/freeradius latest "Install RADIUS"
     else
         espin - $VERIFIED
     fi
@@ -1041,10 +1036,10 @@
 STIME=$(date +%s)
 if [ $SKIP_RESTART_API == "no" ]; then
     echo -e "Restart VOLTHA API $RESTART"
-    API="voltha-api-server-.* ofagent-.*"
-    (set -x; kubectl scale --replicas=0 deployment -n voltha voltha-api-server ofagent >>$LOG 2>&1) >>$LOG 2>&1
+    API="voltha-api-server-.* voltha-ofagent-.*"
+    (set -x; kubectl scale --replicas=0 deployment -n voltha voltha-api-server voltha-ofagent >>$LOG 2>&1) >>$LOG 2>&1
     wait_for_pods - "voltha" 0 "includes" -1 "Wait for API to stop $STOP" $API
-    (set -x; kubectl scale --replicas=1 deployment -n voltha voltha-api-server ofagent >>$LOG 2>&1) >>$LOG 2>&1
+    (set -x; kubectl scale --replicas=1 deployment -n voltha voltha-api-server voltha-ofagent >>$LOG 2>&1) >>$LOG 2>&1
     wait_for_pods - "voltha" 2 "includes" -1 "Wait for API to re-start $GO" $API
 else
     bspin "Skip VOLTHA API Restart"
@@ -1090,9 +1085,6 @@
 
 for O in $ALL_OPTIONS; do
     VAL=$(eval echo \$$O)
-    if [ $O == "USE_GO" ]; then
-        VAL="$(echo $VAL| test $(grep -c true) -eq 1 && echo yes || echo no)"
-    fi
     if [ ! -z "$VAL" -a $(grep -c "^export $O=" $NAME-env.sh) -eq 0 ]; then
         echo "export $O=\"$(eval echo \$$O)\"" >> $NAME-env.sh
     fi