diff --git a/scripts/asfvolt-bal-buildall.sh b/scripts/asfvolt-bal-buildall.sh
index 29bcbcf..7107f69 100755
--- a/scripts/asfvolt-bal-buildall.sh
+++ b/scripts/asfvolt-bal-buildall.sh
@@ -22,7 +22,7 @@
 # override shell variables to match custom local build environment
 : ${ONL_TOPDIR:=`pwd`}
 : ${MAKE_JOBS:=1}
-: ${BALSRC_RELEASE:=bal_src_release}
+: ${BALSRC_RELEASE:=${BROADCOM_DOWNLOAD_DIR}/bal_src_release}
 : ${SWISDK_TARNAME:=sdk-all-6.5.7}
 
 echo ONL_TOPDIR=${ONL_TOPDIR}
diff --git a/scripts/asfvolt-bal-prepare.sh b/scripts/asfvolt-bal-prepare.sh
index 14bbd6d..f847fa6 100755
--- a/scripts/asfvolt-bal-prepare.sh
+++ b/scripts/asfvolt-bal-prepare.sh
@@ -22,36 +22,45 @@
 # override shell variables to match custom local build environment
 : ${ONL_TOPDIR:=`pwd`}
 : ${BALSRC_RELEASE:=bal_src_release}
-: ${BALSRC_ZIPNAME:=SW-BCM68620_2_4_7_12.zip}
+: ${BALSRC_ZIPNAME:=SW-BCM68620_2_6_0_1.zip}
 : ${SWISDK_TARNAME:=sdk-all-6.5.7}
 
-: ${BROADCOM_DOWNLOAD_DIR:=${HOME}/broadcom/download}  # directory containing SW-BCM68620_2_4_x.zip
-: ${EDGECORE_DOWNLOAD_DIR:=${HOME}/edgecore/download}  # directory containing ASFvOLT16 patch file for BAL
+: ${BROADCOM_DOWNLOAD_DIR:=${HOME}/OpenNetworkLinux}  # directory containing SW-BCM68620_2_4_x.zip
+: ${EDGECORE_DOWNLOAD_DIR:=${HOME}/OpenNetworkLinux}  # directory containing ASFvOLT16 patch file for BAL
 
-: ${PATCH_FILENAME:=ACCTON_BAL_2.4.7.12-V201712061142.patch}   # use latest known ASFvOLT16 patch file as default
+: ${PATCH_FILENAME_1:=ACCTON_BAL_2.6.0.1-V201804301043.patch}   # use latest known ASFvOLT16 patch file as default
+: ${PATCH_FILENAME_2:=bal_2_6_0_1_5_18_2018.patch}   # Transparent double tag fix
+: ${PATCH_FILENAME_3:=bal_2_6_0_1_23_07_2018_rsys.patch}   # Flow deactivate and delete fix
 
 echo ONL_TOPDIR=${ONL_TOPDIR}
 echo BALSRC_RELEASE=${BALSRC_RELEASE}
 echo BALSRC_ZIPNAME=${BALSRC_ZIPNAME}
 echo SWISDK_TARNAME=${SWISDK_TARNAME}
-echo PATCH_FILENAME=${PATCH_FILENAME}
+echo PATCH_FILENAME_1=${PATCH_FILENAME_1}
+echo PATCH_FILENAME_2=${PATCH_FILENAME_2}
+echo PATCH_FILENAME_3=${PATCH_FILENAME_3}
 echo BROADCOM_DOWNLOAD_DIR=${BROADCOM_DOWNLOAD_DIR}
 echo EDGECORE_DOWNLOAD_DIR=${EDGECORE_DOWNLOAD_DIR}
 
-mkdir -p $ONL_TOPDIR/${BALSRC_RELEASE}
-cd $ONL_TOPDIR/${BALSRC_RELEASE}
+cp -rf $EDGECORE_DOWNLOAD_DIR/asfvolt16-driver/brcm_code/* ${BROADCOM_DOWNLOAD_DIR}/
+mkdir -p ${BROADCOM_DOWNLOAD_DIR}/${BALSRC_RELEASE}
+cd ${BROADCOM_DOWNLOAD_DIR}/${BALSRC_RELEASE}
 
 unzip ${BROADCOM_DOWNLOAD_DIR}/${BALSRC_ZIPNAME}
 cp $BROADCOM_DOWNLOAD_DIR/${SWISDK_TARNAME}.tar.gz bal_release/3rdparty/bcm-sdk/
 
-cp $EDGECORE_DOWNLOAD_DIR/${PATCH_FILENAME}  .
+cp $EDGECORE_DOWNLOAD_DIR/${PATCH_FILENAME_1}  .
+cp $EDGECORE_DOWNLOAD_DIR/${PATCH_FILENAME_2}  .
+cp $EDGECORE_DOWNLOAD_DIR/${PATCH_FILENAME_3}  .
 chmod -R 744 .
-patch -p1 < ${PATCH_FILENAME}
+patch -p1 < ${PATCH_FILENAME_1}
+patch -p1 < ${PATCH_FILENAME_2}
+patch -p1 < ${PATCH_FILENAME_3}
 
 mkdir -p bcm68620_release/asfvolt16/kernels
 cd bcm68620_release/asfvolt16/kernels
-ln -s ../../../../packages/base/amd64/kernels/kernel-3.7-x86-64-all/builds/linux-3.7.10 linux-3.7.10
-ln -s ../../../../packages/base/any/kernels/archives/linux-3.7.10.tar.xz linux-3.7.10.tar.xz
-ln -s ../../../../packages/base/any/kernels/3.7/configs/x86_64-all/x86_64-all.config x86_64-all.config
+ln -s ${ONL_TOPDIR}/packages/base/amd64/kernels/kernel-3.7-x86-64-all/builds/linux-3.7.10 linux-3.7.10
+ln -s ${ONL_TOPDIR}/packages/base/any/kernels/archives/linux-3.7.10.tar.xz linux-3.7.10.tar.xz
+ln -s ${ONL_TOPDIR}/packages/base/any/kernels/3.7/configs/x86_64-all/x86_64-all.config x86_64-all.config
 
 echo "BAL build area prepared"
diff --git a/scripts/asfvolt-driver-build.sh b/scripts/asfvolt-driver-build.sh
index 7995fd6..b4b1551 100755
--- a/scripts/asfvolt-driver-build.sh
+++ b/scripts/asfvolt-driver-build.sh
@@ -23,12 +23,12 @@
 
 # override shell variables to match custom local build environment
 : ${ONL_TOPDIR:=`pwd`}
-: ${BALSRC_RELEASE=bal_src_release}
-: ${VOLTHA_TOPDIR:=${HOME}/voltha/incubator/voltha}
-: ${BALSRC_TOPDIR:=${ONL_TOPDIR}/${BALSRC_RELEASE}/bal_release}
-: ${ASFSRC_TOPDIR:=${ONL_TOPDIR}/${ASFVOLT_REPO_NAME}/src}
-: ${DEVSIM_TOPDIR:=${ONL_TOPDIR}/${ASFVOLT_REPO_NAME}/device_simulator}
-: ${PATCHF_TOPDIR:=${ONL_TOPDIR}/${ASFVOLT_REPO_NAME}/patches}
+: ${BALSRC_RELEASE=${BROADCOM_DOWNLOAD_DIR}/bal_src_release}
+: ${VOLTHA_TOPDIR:=${HOME}/voltha}
+: ${BALSRC_TOPDIR:=${BALSRC_RELEASE}/bal_release}
+: ${ASFSRC_TOPDIR:=${EDGECORE_DOWNLOAD_DIR}/${ASFVOLT_REPO_NAME}/src}
+: ${PATCHF_TOPDIR:=${EDGECORE_DOWNLOAD_DIR}/${ASFVOLT_REPO_NAME}/patches}
+: ${GRPC_C_PATH:=${EDGECORE_DOWNLOAD_DIR}/grpc-c}
 
 echo ONL_TOPDIR=${ONL_TOPDIR}
 echo MAKE_JOBS=${MAKE_JOBS}
@@ -36,7 +36,6 @@
 echo VOLTHA_TOPDIR=${VOLTHA_TOPDIR}
 echo BALSRC_TOPDIR=${BALSRC_TOPDIR}
 echo ASFSRC_TOPDIR=${ASFSRC_TOPDIR}
-echo DEVSIM_TOPDIR=${DEVSIM_TOPDIR}
 echo PATCHF_TOPDIR=${PATCHF_TOPDIR}
 
 # archived ZIP files from "https://github.com/opennetworkinglab/asfvolt16-driver/tree/master/third_party"
@@ -45,6 +44,8 @@
 PROTOBUF_ARCH=703cd8e11c8d34283d4c8bf869c61866e8211c9d
 PROTOBUF_C_ARCH=6a4f9a9a67c06769aaa9f65e8f89a56483271f5a
 
+cd ${EDGECORE_DOWNLOAD_DIR}
+
 # Note: removes existing directories: grpc, protobuf
 rm -rf grpc protobuf grpc-* protobuf-*
 
@@ -56,6 +57,7 @@
 
 #steps to install grpc
 #   - Download as zip "grpc", "grpc-c", "protobuf" and "protobuf-c" from "https://github.com/opennetworkinglab/asfvolt16-driver/tree/master/third_party"
+#comment the below 4 lines and download manually in case of errors
 wget https://github.com/grpc/grpc/archive/${GRPC_ARCH}.zip
 wget https://github.com/Juniper/grpc-c/archive/${GRPC_C_ARCH}.zip
 wget https://github.com/google/protobuf/archive/${PROTOBUF_ARCH}.zip
@@ -86,7 +88,7 @@
 #  - ./configure
 #  - make
 #  - sudo make install
-cd ${ONL_TOPDIR}/grpc/thirdparty/protobuf
+cd ${EDGECORE_DOWNLOAD_DIR}/grpc/thirdparty/protobuf
 ./autogen.sh
 ./configure
 make --jobs=${MAKE_JOBS}
@@ -97,7 +99,7 @@
 # - make
 # - sudo make install
 
-cd ${ONL_TOPDIR}/grpc
+cd ${EDGECORE_DOWNLOAD_DIR}/grpc
 export LD_LIBRARY_PATH=/usr/local/lib
 make --jobs=${MAKE_JOBS}
 sudo make install
@@ -109,7 +111,7 @@
 #- make
 #- sudo make install
 
-cd ${ONL_TOPDIR}/grpc-c/third_party/protobuf-c
+cd ${EDGECORE_DOWNLOAD_DIR}/grpc-c/third_party/protobuf-c
 ./autogen.sh
 ./configure
 export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/protobuf
@@ -118,7 +120,7 @@
 
 #Apply grpc-c patch
 #   - cd ${HOME}/OpenNetworkLinux/grpc-c/
-cd ${ONL_TOPDIR}/grpc-c
+cd ${EDGECORE_DOWNLOAD_DIR}/grpc-c
 #     Patch 1:
 #     Apply patch in following link for grpc-c/lib - "https://github.com/Juniper/grpc-c/commit/353b40cd920cd749ed6cf71f8df17f1d5cf2c89d"
 #     Note:
@@ -130,18 +132,9 @@
 #     Apply patch in service.c.patch and client.c.patch
 patch -p1 -i ${PATCHF_TOPDIR}/grpc-c_asfvolt16.patch
 
-#
-#     - cd ${HOME}/OpenNetworkLinux
-#     - cp asfvolt16-driver/device_simulator/Makefile.am grpc-c/examples/
-#     - cp asfvolt16-driver/device_simulator/voltha_bal_driver.c grpc-c/examples/
-#     - cp asfvolt16-driver/device_simulator/bal_stub.c grpc-c/examples/
-#     - cp asfvolt16-driver/device_simulator/bal_stub.h grpc-c/examples/
-#         - Note: Update voltha adaptor IP in bal_stub.c (Is this required? Not clear which variable needs to be updated).
 cd ${ONL_TOPDIR}
-cp ${DEVSIM_TOPDIR}/Makefile.am grpc-c/examples/
-cp ${DEVSIM_TOPDIR}/voltha_bal_driver.c grpc-c/examples/
-cp ${DEVSIM_TOPDIR}/bal_stub.c grpc-c/examples/
-cp ${DEVSIM_TOPDIR}/bal_stub.h grpc-c/examples/
+cp ${ASFSRC_TOPDIR}/Makefile.am ${EDGECORE_DOWNLOAD_DIR}/grpc-c/examples/
+cp ${ASFSRC_TOPDIR}/voltha_bal_driver.c ${EDGECORE_DOWNLOAD_DIR}/grpc-c/examples/
 
 #
 #     - cd ${HOME}/OpenNetworkLinux/grpc-c
@@ -150,7 +143,7 @@
 #     - ../configure
 #     - make
 #     - sudo make install
-cd ${ONL_TOPDIR}/grpc-c
+cd ${EDGECORE_DOWNLOAD_DIR}/grpc-c
 autoreconf --install
 mkdir build && cd build
 ../configure
@@ -162,13 +155,13 @@
 #     - cd ${HOME}/OpenNetworkLinux/grpc-c/
 #     - cp ${HOME}/voltha/voltha/adapters/asfvolt16_olt/protos/* examples/
 #
-cd ${ONL_TOPDIR}/grpc-c
+cd ${EDGECORE_DOWNLOAD_DIR}/grpc-c
 cp ${VOLTHA_TOPDIR}/voltha/adapters/asfvolt16_olt/protos/* examples
 
 #To autogenerate code from proto files:
 #     - cd ${HOME}/OpenNetworkLinux/grpc-c/build/examples
 #     - make autogen
-cd ${ONL_TOPDIR}/grpc-c/build/examples
+cd ${EDGECORE_DOWNLOAD_DIR}/grpc-c/build/examples
 make autogen
 
 #
@@ -176,7 +169,7 @@
 #     - cd ${HOME}/OpenNetworkLinux/grpc-c/build/examples
 #     - Note: Remove "-O2" from Makefile
 #     - Note: Set EDGECORE and BRCM_PATH in Makefile
-cd ${ONL_TOPDIR}/grpc-c/build/examples
+cd ${EDGECORE_DOWNLOAD_DIR}/grpc-c/build/examples
 sed -i -e 's/-O2/-O0/g' \
        -e "s:^EDGECORE = /home/asfvolt/shared.*:#&\nEDGECORE = ${ASFSRC_TOPDIR}:" \
        -e "s:^BRCM_PATH = /home/asfvolt/shared.*:#&\nBRCM_PATH = ${BALSRC_TOPDIR}:" \
@@ -184,12 +177,13 @@
 
 pushd ${ASFSRC_TOPDIR}
 sed -i -e "s:^BRDCM_SRC=/home/asfvolt/shared.*:#&\nBRDCM_SRC = ${BALSRC_TOPDIR}:" \
-       -e "s:^GRPC_C_PATH= /home/asfvolt/shared.*:#&\nGRPC_C_PATH = ${ONL_TOPDIR}/grpc-c:" \
-        Makefile
+       -e "s:^GRPC_C_PATH=/home/asfvolt/shared.*:#&\nGRPC_C_PATH = ${GRPC_C_PATH}:" \
+       Makefile
 popd
+
 #```
-#       EDGECORE = ${HOME}/OpenNetworkLinux/asfvolt16-driver/src/
-#       BRCM_PATH = ${HOME}/OpenNetworkLinux/bal_src_release/bal_release
+#       EDGECORE = ${EDGECORE_DOWNLOAD_DIR}asfvolt16-driver/src/
+#       BRCM_PATH = ${BROADCOM_DOWNLOAD_DIR}/bal_src_release/bal_release
 #```
 #     - make clean_all;make
 make clean_all
diff --git a/scripts/asfvolt-driver-package.sh b/scripts/asfvolt-driver-package.sh
index b6f7d62..7555191 100755
--- a/scripts/asfvolt-driver-package.sh
+++ b/scripts/asfvolt-driver-package.sh
@@ -24,10 +24,10 @@
 # override shell variables to match custom local build environment
 : ${ONL_TOPDIR:=`pwd`}
 : ${BALSRC_RELEASE:=bal_src_release}
-: ${BALREL_TOPDIR:=${ONL_TOPDIR}/${BALSRC_RELEASE}}
-: ${BALSRC_TOPDIR:=${ONL_TOPDIR}/${BALSRC_RELEASE}/bal_release}
-: ${ASFSCR_TOPDIR:=${ONL_TOPDIR}/${ASFVOLT_REPO_NAME}/scripts}
-: ${ASFDRVR_PKGDIR:=${ONL_TOPDIR}/asfdrvr-package-dir}
+: ${BALREL_TOPDIR:=${BROADCOM_DOWNLOAD_DIR}/${BALSRC_RELEASE}}
+: ${BALSRC_TOPDIR:=${EDGECORE_DOWNLOAD_DIR}/${BALSRC_RELEASE}/bal_release}
+: ${ASFSCR_TOPDIR:=${EDGECORE_DOWNLOAD_DIR}/${ASFVOLT_REPO_NAME}/scripts}
+: ${ASFDRVR_PKGDIR:=${EDGECORE_DOWNLOAD_DIR}/asfdrvr-package-dir}
 : ${ASFDVR_TARBALL_NAME:=asfvolt16-voltha-bal}
 : ${BUILD_FILENAME_TAG:=`date +%Y%m%d%H%M`}
 : ${ASFDVR_TARBALL_FNAME:=${ASFDVR_TARBALL_NAME}-${BUILD_FILENAME_TAG}.tgz}
@@ -42,7 +42,8 @@
 echo BUILD_FILENAME_TAG=${BUILD_FILENAME_TAG}
 echo ASFDVR_TARBALL_FNAME=${ASFDVR_TARBALL_FNAME}
 
-# Note: removes existing directories: asfvolt16-driver, grpc, protobuf
+# Note: removes existing directories: asfvolt16-driver
+cd ${EDGECORE_DOWNLOAD_DIR}
 rm -rf ${ASFDRVR_PKGDIR}
 
 
@@ -56,25 +57,25 @@
 cd broadcom
 
 # add grpc-c libs
-cp -pR ${ONL_TOPDIR}/grpc-c/build/lib/.libs/libgrpc-c.so.0.0.0 .
+cp -pR ${EDGECORE_DOWNLOAD_DIR}/grpc-c/build/lib/.libs/libgrpc-c.so.0.0.0 .
 ln -s /broadcom/libgrpc-c.so.0.0.0 libgrpc-c.so.0
 ln -s /broadcom/libgrpc-c.so.0.0.0 libgrpc-c.so
 
 # add grpc libs
-cp -pR ${ONL_TOPDIR}/grpc/libs/opt/libgrp*.so* .
-cp -pR ${ONL_TOPDIR}/grpc/libs/opt/libgpr*.so* .
+cp -pR ${EDGECORE_DOWNLOAD_DIR}/grpc/libs/opt/libgrp*.so* .
+cp -pR ${EDGECORE_DOWNLOAD_DIR}/grpc/libs/opt/libgpr*.so* .
 
 # add protobuf-c libs
-cp -pR ${ONL_TOPDIR}/grpc-c/third_party/protobuf-c/protobuf-c/.libs/libprotobuf-c.so* .
+cp -pR ${EDGECORE_DOWNLOAD_DIR}/grpc-c/third_party/protobuf-c/protobuf-c/.libs/libprotobuf-c.so* .
 
 # add protobuf libs
-cp -pR ${ONL_TOPDIR}/grpc/thirdparty/protobuf/src/.libs/libprotobuf.so* .
-cp -pR ${ONL_TOPDIR}/grpc/thirdparty/protobuf/src/.libs/libprotobuf-lite.so* .
-cp -pR ${ONL_TOPDIR}/grpc/thirdparty/protobuf/src/.libs/libprotoc.so* .
+cp -pR ${EDGECORE_DOWNLOAD_DIR}/grpc/thirdparty/protobuf/src/.libs/libprotobuf.so* .
+cp -pR ${EDGECORE_DOWNLOAD_DIR}/grpc/thirdparty/protobuf/src/.libs/libprotobuf-lite.so* .
+cp -pR ${EDGECORE_DOWNLOAD_DIR}/grpc/thirdparty/protobuf/src/.libs/libprotoc.so* .
 rm *.0T
 
 # add voltha_bal_driver
-cp -pR ${ONL_TOPDIR}/grpc-c/build/examples/.libs/voltha_bal_driver .
+cp -pR ${EDGECORE_DOWNLOAD_DIR}/grpc-c/build/examples/.libs/voltha_bal_driver .
 
 # add voltha driver startup scripts
 cp -p ${ASFSCR_TOPDIR}/voltha_init_sh voltha_init.sh
diff --git a/scripts/asfvolt-voltha_bal_driver-build.sh b/scripts/asfvolt-voltha_bal_driver-build.sh
new file mode 100755
index 0000000..19ce328
--- /dev/null
+++ b/scripts/asfvolt-voltha_bal_driver-build.sh
@@ -0,0 +1,83 @@
+#
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+# Run from OpenNetworkLinux top directory
+#
+#cd /aux/OpenNetworkLinux
+set -e
+ASFVOLT_REPO_NAME=asfvolt16-driver
+: ${MAKE_JOBS:=4}
+
+# override shell variables to match custom local build environment
+: ${ONL_TOPDIR:=`pwd`}
+: ${BALSRC_RELEASE=${BROADCOM_DOWNLOAD_DIR}/bal_src_release}
+: ${VOLTHA_TOPDIR:=${HOME}/voltha}
+: ${BALSRC_TOPDIR:=${BALSRC_RELEASE}/bal_release}
+: ${ASFSRC_TOPDIR:=${EDGECORE_DOWNLOAD_DIR}/${ASFVOLT_REPO_NAME}/src}
+: ${PATCHF_TOPDIR:=${EDGECORE_DOWNLOAD_DIR}/${ASFVOLT_REPO_NAME}/patches}
+: ${GRPC_C_PATH:=${EDGECORE_DOWNLOAD_DIR}/grpc-c}
+
+echo ONL_TOPDIR=${ONL_TOPDIR}
+echo MAKE_JOBS=${MAKE_JOBS}
+echo BALSRC_RELEASE=${BALSRC_RELEASE}
+echo VOLTHA_TOPDIR=${VOLTHA_TOPDIR}
+echo BALSRC_TOPDIR=${BALSRC_TOPDIR}
+echo ASFSRC_TOPDIR=${ASFSRC_TOPDIR}
+echo PATCHF_TOPDIR=${PATCHF_TOPDIR}
+
+#To obtain proto files - Have a repo sync of opencord voltha code base:
+#     - git clone https://github.com/opencord/voltha.git ${HOME}/voltha
+#     - cd ${HOME}/OpenNetworkLinux/grpc-c/
+#     - cp ${HOME}/voltha/voltha/adapters/asfvolt16_olt/protos/* examples/
+#
+cd ${EDGECORE_DOWNLOAD_DIR}/grpc-c
+cp ${VOLTHA_TOPDIR}/voltha/adapters/asfvolt16_olt/protos/* examples/
+
+#To autogenerate code from proto files:
+#     - cd ${HOME}/OpenNetworkLinux/grpc-c/build/examples
+#     - make autogen
+cd ${EDGECORE_DOWNLOAD_DIR}/grpc-c/build/examples
+cp ${ASFSRC_TOPDIR}/voltha_bal_driver.c ${EDGECORE_DOWNLOAD_DIR}/grpc-c/examples/
+make autogen
+
+#
+#Build voltha_bal_driver:
+#     - cd ${HOME}/OpenNetworkLinux/grpc-c/build/examples
+#     - Note: Remove "-O2" from Makefile
+#     - Note: Set EDGECORE and BRCM_PATH in Makefile
+cd ${EDGECORE_DOWNLOAD_DIR}/grpc-c/build/examples
+sed -i -e 's/-O2/-O0/g' \
+       -e "s:^EDGECORE = /home/asfvolt/shared.*:#&\nEDGECORE = ${ASFSRC_TOPDIR}:" \
+       -e "s:^BRCM_PATH = /home/asfvolt/shared.*:#&\nBRCM_PATH = ${BALSRC_TOPDIR}:" \
+        Makefile
+
+pushd ${ASFSRC_TOPDIR}
+sed -i -e "s:^BRDCM_SRC=/home/asfvolt/shared.*:#&\nBRDCM_SRC = ${BALSRC_TOPDIR}:" \
+       -e "s:^GRPC_C_PATH=/home/asfvolt/shared.*:#&\nGRPC_C_PATH = ${GRPC_C_PATH}:" \
+        Makefile
+popd
+
+#```
+#       EDGECORE = ${EDGECORE_DOWNLOAD_DIR}/asfvolt16-driver/src/
+#       BRCM_PATH = ${BROADCOM_DOWNLOAD_DIR}/bal_src_release/bal_release
+#```
+#     - make clean_all;make
+make clean_all
+make
+#
+#The ultimate executable voltha_bal_driver can be found under ~/grpc-c/build/examples/.libs/
+
+echo "${ASFVOLT_REPO_NAME} build complete"
diff --git a/scripts/voltha_init_sh b/scripts/voltha_init_sh
index daa465f..8759b55 100755
--- a/scripts/voltha_init_sh
+++ b/scripts/voltha_init_sh
@@ -43,7 +43,7 @@
 echo "${FAN_RATE}" > /sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-1/i2c-9/9-0066/fan_duty_cycle_percentage
 
 echo Starting distributed BAL server
-./bal_core_dist -ne -C ${VOLTHA_LOCIP}:40000 -A ${VOLTHA_LOCIP}:50000 2>${CONSOLE_DEVOUT} <${CONSOLE_DEVINP} &
+./bal_core_dist -ne -C ${VOLTHA_LOCIP}:40000 2>${CONSOLE_DEVOUT} <${CONSOLE_DEVINP} &
 sleep 1
 echo Starting VOLTHA BAL driver
-./voltha_bal_driver ${VOLTHA_LOCIP}:50060 -C ${VOLTHA_LOCIP}:40000 -A ${VOLTHA_LOCIP}:50000 2>${CONSOLE_DEVOUT} <${CONSOLE_DEVINP} &
+./voltha_bal_driver ${VOLTHA_LOCIP}:50060 -C ${VOLTHA_LOCIP}:40000 2>${CONSOLE_DEVOUT} <${CONSOLE_DEVINP} &