diff --git a/net/config_neels b/net/config_neels
index b9dab6f..5405b97 100644
--- a/net/config_neels
+++ b/net/config_neels
@@ -2,7 +2,8 @@ ETH_DEV=eth0
 APN_DEV=apn0
 
 TO_RAN_IP="192.168.178.73"
-TO_RAN_IU_IP="192.168.178.82"
+TO_RAN_IP2="192.168.178.82"
+TO_RAN_IU_IP="${TO_RAN_IP2}"
 TO_SIP_IP=${TO_RAN_IP}
 
 STATSD_IP="127.0.0.1"
@@ -12,9 +13,9 @@ MNC=42
 
 TCH_TYPE1=TCH/F
 TCH_TYPE=TCH/F
+BSC_CODEC_LIST="fr3 fr2 fr1 hr3 hr1"
 
 BTS_BAND=GSM-1800
-BTS_LAC=23
 BTS_MAX_POWER_RED=22
 BTS_CODEC_SUPPORT=fr efr hr amr
 BTS_200mW=23
@@ -32,7 +33,7 @@ BTS0_NSEI="${BTSn_NSVCI}"
 # according to osmo-bsc vty, BVCI must be >= 2
 BTS0_BVCI="100${BTSn}"
 BTS0_BAND=${BTS_BAND}
-BTS0_LAC=${BTS_LAC}
+BTS0_LAC=23
 BTS0_MAX_POWER_RED=${BTS_MAX_POWER_RED}
 BTS0_NOMINAL_POWER=${BTS_200mW}
 BTS0_CODEC_SUPPORT=${BTS_CODEC_SUPPORT}
@@ -49,7 +50,7 @@ BTS1_NSVCI=${BTSn}
 BTS1_NSEI="${BTSn_NSVCI}"
 BTS1_BVCI="100${BTSn}"
 BTS1_BAND=${BTS_BAND}
-BTS1_LAC=${BTS_LAC}
+BTS1_LAC=42
 BTS1_MAX_POWER_RED=${BTS_MAX_POWER_RED}
 BTS1_NOMINAL_POWER=${BTS_200mW}
 BTS1_CODEC_SUPPORT=${BTS_CODEC_SUPPORT}
@@ -83,7 +84,11 @@ MGW4BSC_VTY_IP="127.0.0.2"
 
 BSC_IP="${TO_RAN_IP}"
 BSC_PC="0.23.3"
-BSC_CODEC_LIST="fr3 fr2 fr1 hr3 hr1"
+BSC_VTY_CTRL_IP=127.0.0.1
+
+BSC2_IP="${TO_RAN_IP2}"
+BSC2_PC="1.23.3"
+BSC2_VTY_CTRL_IP=127.0.0.2
 
 HNBGW_PC="0.3.0"
 HNBGW_IP="${TO_RAN_IP}"
diff --git a/net/templates/osmo-bsc.cfg b/net/templates/osmo-bsc.cfg
index 17a4569..1f0e5b1 100644
--- a/net/templates/osmo-bsc.cfg
+++ b/net/templates/osmo-bsc.cfg
@@ -11,6 +11,9 @@ stats reporter statsd
 !
 line vty
  no login
+ bind ${BSC_VTY_CTRL_IP}
+ctrl
+ bind ${BSC_VTY_CTRL_IP}
 !
 e1_input
  e1_line 0 driver ipa
@@ -26,37 +29,37 @@ network
  encryption a5 ${ENCR_A5}
  neci 1
  paging any use tch 0
- handover 0
+ handover 1
+ handover algorithm 2
  periodic location update 12
  meas-feed destination 127.0.0.1 8888
 
-${foreach(BTS)}
- bts ${BTSn}
-  description ${BTSn_DESCRIPTION}
+ bts 0
+  description ${BTS0_DESCRIPTION}
   type sysmobts
   band ${BTS_BAND}
-  ip.access unit_id ${BTSn_IPA_UNIT}
-  location_area_code ${BTSn_LAC}
-  cell_identity ${BTSn_CI}
-  base_station_id_code ${BTSn_BSIC}
-  codec-support ${BTSn_CODEC_SUPPORT}
+  ip.access unit_id ${BTS0_IPA_UNIT}
+  location_area_code ${BTS0_LAC}
+  cell_identity ${BTS0_CI}
+  base_station_id_code ${BTS0_BSIC}
+  codec-support ${BTS0_CODEC_SUPPORT}
   amr tch-f modes 7
   amr tch-f start-mode 1
   amr tch-h modes 0 3
   amr tch-h start-mode auto
-  gprs mode ${BTSn_GPRS_MODE}
-  gprs nsvc 0 remote ip ${BTSn_GB_REMOTE_IP}
-  gprs nsvc 0 remote udp port ${BTSn_GB_REMOTE_PORT}
+  gprs mode ${BTS0_GPRS_MODE}
+  gprs nsvc 0 remote ip ${BTS0_GB_REMOTE_IP}
+  gprs nsvc 0 remote udp port ${BTS0_GB_REMOTE_PORT}
   gprs nsvc 0 local udp port ${PCU_GB_LOCAL_PORT}
-  gprs nsvc 0 nsvci ${BTSn_NSVCI}
-  gprs nsei ${BTSn_NSEI}
-  gprs cell bvci ${BTSn_BVCI}
+  gprs nsvc 0 nsvci ${BTS0_NSVCI}
+  gprs nsei ${BTS0_NSEI}
+  gprs cell bvci ${BTS0_BVCI}
   trx 0
-   arfcn ${BTSn_ARFCN}
-   description ${BTSn_DESCRIPTION}
+   arfcn ${BTS0_ARFCN}
+   description ${BTS0_DESCRIPTION}
    rf_locked 0
-   nominal power ${BTSn_NOMINAL_POWER}
-   max_power_red ${BTSn_MAX_POWER_RED}
+   nominal power ${BTS0_NOMINAL_POWER}
+   max_power_red ${BTS0_MAX_POWER_RED}
    timeslot 0
     phys_chan_config CCCH+SDCCH4
    timeslot 1
@@ -73,7 +76,9 @@ ${foreach(BTS)}
     phys_chan_config ${TCH_TYPE}
    timeslot 7
     phys_chan_config PDCH
-${foreach_end}
+
+ bts 0
+  neighbor cgi ${MCC} ${MNC} ${BTS1_LAC} ${BTS1_CI} arfcn ${BTS1_ARFCN} bsic ${BTS1_BSIC}
 
 msc 0
  mgw remote-ip ${MGW4BSC_IP}
diff --git a/net/templates/osmo-bsc2.cfg b/net/templates/osmo-bsc2.cfg
new file mode 100644
index 0000000..0050f33
--- /dev/null
+++ b/net/templates/osmo-bsc2.cfg
@@ -0,0 +1,116 @@
+${include(common_template_warning)}
+stats interval 5
+!
+stats reporter statsd
+  disable
+  remote-ip ${STATSD_IP}
+  remote-port 9125
+  level global
+  no prefix
+  enable
+!
+line vty
+ no login
+ bind ${BSC2_VTY_CTRL_IP}
+ctrl
+ bind ${BSC2_VTY_CTRL_IP}
+!
+e1_input
+ e1_line 0 driver ipa
+ e1_line 0 port 0
+ no e1_line 0 keepalive
+ ipa bind ${BSC2_IP}
+cs7 instance 0
+ point-code ${BSC2_PC}
+ asp asp-bsc2-clnt-msc-0 2905 0 m3ua
+  remote-ip 127.0.0.1
+  local-ip ${BSC2_VTY_CTRL_IP}
+ #as as-bsc2-clnt-msc-0 m3ua
+ # asp asp-bsc2-clnt-msc-0
+  #routing-key 5 ${BSC2_PC}
+network
+ network country code ${MCC}
+ mobile network code ${MNC}
+ encryption a5 ${ENCR_A5}
+ neci 1
+ paging any use tch 0
+ handover 1
+ handover algorithm 2
+ periodic location update 12
+ meas-feed destination 127.0.0.1 8888
+
+ bts 0
+  description ${BTS1_DESCRIPTION}
+  type sysmobts
+  band ${BTS_BAND}
+  ip.access unit_id ${BTS1_IPA_UNIT}
+  location_area_code ${BTS1_LAC}
+  cell_identity ${BTS1_CI}
+  base_station_id_code ${BTS1_BSIC}
+  codec-support ${BTS1_CODEC_SUPPORT}
+  amr tch-f modes 7
+  amr tch-f start-mode 1
+  amr tch-h modes 0 3
+  amr tch-h start-mode auto
+  gprs mode ${BTS1_GPRS_MODE}
+  gprs nsvc 0 remote ip ${BTS1_GB_REMOTE_IP}
+  gprs nsvc 0 remote udp port ${BTS1_GB_REMOTE_PORT}
+  gprs nsvc 0 local udp port ${PCU_GB_LOCAL_PORT}
+  gprs nsvc 0 nsvci ${BTS1_NSVCI}
+  gprs nsei ${BTS1_NSEI}
+  gprs cell bvci ${BTS1_BVCI}
+  trx 0
+   arfcn ${BTS1_ARFCN}
+   description ${BTS1_DESCRIPTION}
+   rf_locked 0
+   nominal power ${BTS1_NOMINAL_POWER}
+   max_power_red ${BTS1_MAX_POWER_RED}
+   timeslot 0
+    phys_chan_config CCCH+SDCCH4
+   timeslot 1
+    phys_chan_config SDCCH8
+   timeslot 2
+    phys_chan_config ${TCH_TYPE}
+   timeslot 3
+    phys_chan_config ${TCH_TYPE}
+   timeslot 4
+    phys_chan_config ${TCH_TYPE}
+   timeslot 5
+    phys_chan_config ${TCH_TYPE}
+   timeslot 6
+    phys_chan_config ${TCH_TYPE}
+   timeslot 7
+    phys_chan_config PDCH
+
+ bts 0
+  neighbor cgi ${MCC} ${MNC} ${BTS0_LAC} ${BTS0_CI} arfcn ${BTS0_ARFCN} bsic ${BTS0_BSIC}
+
+msc 0
+ mgw remote-ip ${MGW4BSC_IP}
+ mgw remote-port ${MGW4BSC_PORT}
+ mgw endpoint-domain bsc
+ allow-emergency deny
+ codec-list ${BSC_CODEC_LIST}
+ amr-config 12_2k allowed
+ amr-config 10_2k forbidden
+ amr-config 7_95k forbidden
+ amr-config 7_40k forbidden
+ amr-config 6_70k allowed
+ amr-config 5_90k forbidden
+ amr-config 5_15k forbidden
+ amr-config 4_75k allowed
+
+${foreach(LOG_OUTPUT)}
+log ${LOG_OUTPUTn_TYPE}
+${include(common_logging)}
+ logging level hodec info
+ logging level ho info
+ logging level nm info
+ logging level meas info
+ logging level lmi info
+ logging level linp notice
+ logging level lss7 notice
+ logging level lsccp notice
+ logging level lsua notice
+ logging level lm3ua notice
+${foreach_end}
diff --git a/net/templates/osmo-msc.cfg b/net/templates/osmo-msc.cfg
index 00bf182..10f0303 100644
--- a/net/templates/osmo-msc.cfg
+++ b/net/templates/osmo-msc.cfg
@@ -15,6 +15,8 @@ msc
  check-imei-rqd 1
  # For nano3G:
  iu rab-assign-addr-enc x213
+ neighbor a lac-ci ${BTS0_LAC} ${BTS0_CI} ran-pc ${BSC_PC}
+ neighbor a lac-ci ${BTS1_LAC} ${BTS1_CI} ran-pc ${BSC2_PC}
 mncc-int
  default-codec tch-f fr
  default-codec tch-h amr
diff --git a/net/templates/run.sh b/net/templates/run.sh
index f8d18b9..c34e047 100755
--- a/net/templates/run.sh
+++ b/net/templates/run.sh
@@ -82,6 +82,7 @@ mgw4bsc="osmo-mgw -c osmo-mgw-for-bsc.cfg"
 hlr="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-hlr --db-upgrade"
 stp="osmo-stp"
 bsc="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-bsc -c osmo-bsc.cfg"
+bsc2="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-bsc -c osmo-bsc2.cfg"
 
 if [ "x${MSC_MNCC}" != "xinternal" ]; then
   sipcon="osmo-sip-connector -c osmo-sip-connector.cfg"
@@ -136,6 +137,8 @@ sleep 2
 term "$hnbgw" HNBGW &
 sleep .2
 term "$bsc" BSC &
+sleep .2
+term "$bsc2" BSC2 &
 
 if [ "x${MSC_MNCC}" != "xinternal" ]; then
   sleep .2
@@ -156,7 +159,7 @@ echo Closing...
 
 #ssh bts neels/stop_remote.sh
 
-kill %1 %2 %3 %4 %5 %6 %7 %8 %9 %10 %11 %12 %13 %14
+kill %1 %2 %3 %4 %5 %6 %7 %8 %9 %10 %11 %12 %13 %14 %15
 killall osmo-msc
 killall osmo-bsc
 killall osmo-gbproxy