diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai
index 44c41d4a50f327b05100d842b6baef8d0de5ccbc..04289a83fa0c1b23f233b1aac01e24295cb6e0b1 100755
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -60,6 +60,7 @@ RUN_GROUP=0
 TEST_CASE_GROUP=""
 BUILD_DOXYGEN=0
 T_TRACER="False"
+DISABLE_HARDWARE_DEPENDENCY="False"
 trap handle_ctrl_c INT
 
 function print_help() {
@@ -132,6 +133,8 @@ Options
    Disables CPU Affinity between UHD/TX/RX Threads (Valid only when deadline scheduler is disabled). By defaulT, CPU Affinity is enabled when not using deadline scheduler. It is enabled only with >2 CPUs. For eNB, CPU_0-> Device library (UHD), CPU_1->TX Threads, CPU_2...CPU_MAX->Rx Threads. For UE, CPU_0->Device Library(UHD), CPU_1..CPU_MAX -> All the UE threads
 --T-tracer
    Enables the T tracer.
+--disable-hardware-dependency
+   Disable HW dependency during installation
 Usage (first build):
  oaisim (eNB + UE): ./build_oai -I -g --oaisim -x --install-system-files
  Eurecom EXMIMO + COTS UE : ./build_oai -I -g --eNB -x --install-system-files
diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper
index 550ee67bc76bafb98025b4b6ec2d2ed5987c2aa4..36d341034990b1d15589a6162f814ef9cfa35616 100755
--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -213,7 +213,7 @@ install_gnutls_from_source(){
 
 check_install_usrp_uhd_driver(){
         #first we remove old installation
-        $SUDO apt-get remove libuhd-dev libuhd003 uhd-host -y
+        $SUDO apt-get remove uhd libuhd-dev libuhd003 uhd-host -y
         v=$(lsb_release -cs)
         $SUDO apt-add-repository --remove "deb http://files.ettus.com/binaries/uhd/repo/uhd/ubuntu/$v $v main"
         #The new USRP repository
@@ -267,7 +267,11 @@ check_install_additional_tools (){
 	ctags \
         ntpdate \
         iperf3 \
-        android-tools-adb
+        android-tools-adb \
+	wvdial \
+        python-numpy \
+        sshpass \
+        libxslt1-dev
 
     $SUDO pip install paramiko
     $SUDO pip install pyroute2
@@ -363,12 +367,7 @@ check_install_oai_software() {
 	xmlstarlet \
 	python-pip \
 	pydb \
-	wget \
-	wvdial \
-        python-numpy \
-        sshpass \
-        libxslt1-dev \
-        android-tools-adb
+	wget
 
     $SUDO update-alternatives --set liblapack.so /usr/lib/atlas-base/atlas/liblapack.so
     
@@ -394,6 +393,7 @@ install_asn1c_from_source(){
     ./configure
     make -j`nproc`
     $SUDO make install
+    cd -
     ) > $asn1_install_log 2>&1
 }