diff --git a/net/config_neels b/net/config_neels
index b9dab6f..e0ec80c 100644
--- a/net/config_neels
+++ b/net/config_neels
@@ -7,8 +7,8 @@ TO_SIP_IP=${TO_RAN_IP}
 
 STATSD_IP="127.0.0.1"
 
-MCC=262
-MNC=42
+MCC=901
+MNC=71
 
 TCH_TYPE1=TCH/F
 TCH_TYPE=TCH/F
@@ -56,10 +56,16 @@ BTS1_CODEC_SUPPORT=${BTS_CODEC_SUPPORT}
 
 HLR_IP=127.0.0.1
 
-MSC_PC="0.23.1"
+MSC_PC="0.0.1"
 MSC_MNCC_SOCKET="/tmp/mncc_socket"
 #MSC_MNCC="internal"
 MSC_MNCC="external ${MSC_MNCC_SOCKET}"
+MSC_VTY_CTRL_IP=127.0.0.1
+
+MSC2_PC="0.0.2"
+MSC2_MNCC_SOCKET="/tmp/mncc_socket2"
+MSC2_MNCC="external ${MSC2_MNCC_SOCKET}"
+MSC2_VTY_CTRL_IP=127.0.0.2
 
 AUTH=required
 ENCR_A5=3
@@ -110,6 +116,9 @@ GGSN_GTP_STATE_DIR=/tmp
 SIPCON_SIP="${TO_SIP_IP}"
 SIPCON_SIP_PORT="5060"
 
+SIPCON2_SIP="${TO_SIP_IP}"
+SIPCON2_SIP_PORT="5070"
+
 # PBX_SERVER:
 #  "kamailio" -- launch kamailio
 #  "freeswitch" -- launch freeswitch
diff --git a/net/templates/osmo-bsc.cfg b/net/templates/osmo-bsc.cfg
index 17a4569..89c67c7 100644
--- a/net/templates/osmo-bsc.cfg
+++ b/net/templates/osmo-bsc.cfg
@@ -20,6 +20,10 @@ e1_input
 cs7 instance 0
  point-code ${BSC_PC}
  asp asp-clnt-msc-0 2905 0 m3ua
+ sccp-address msc0
+  point-code ${MSC_PC}
+ sccp-address msc1
+  point-code ${MSC2_PC}
 network
  network country code ${MCC}
  mobile network code ${MNC}
@@ -76,6 +80,25 @@ ${foreach(BTS)}
 ${foreach_end}
 
 msc 0
+ msc-addr msc0
+ nri add 0 0x1ff
+ 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
+
+msc 1
+ msc-addr msc1
+ nri add 0x200 0x3ff
  mgw remote-ip ${MGW4BSC_IP}
  mgw remote-port ${MGW4BSC_PORT}
  mgw endpoint-domain bsc
diff --git a/net/templates/osmo-msc.cfg b/net/templates/osmo-msc.cfg
index 00bf182..8f87eae 100644
--- a/net/templates/osmo-msc.cfg
+++ b/net/templates/osmo-msc.cfg
@@ -1,4 +1,13 @@
 ${include(common_template_warning)}
+line vty
+ bind ${MSC_VTY_CTRL_IP}
+ctrl
+ bind ${MSC_VTY_CTRL_IP}
+sgs
+ local-ip ${MSC_VTY_CTRL_IP}
+
+cs7 instance 0
+ point-code ${MSC_PC}
 network
  network country code ${MCC}
  mobile network code ${MNC}
@@ -8,6 +17,7 @@ network
  long name 35c3
  mm info 1
 msc
+ nri add 0 0x1ff
  mncc ${MSC_MNCC}
  mgw remote-ip ${MGW4MSC_IP}
  mgw remote-port ${MGW4MSC_PORT}
@@ -25,6 +35,8 @@ smpp
  no smpp-first
 hlr
  remote-ip ${HLR_IP}
+ ipa-name msc-1
+
 
 ${foreach(LOG_OUTPUT)}
 log ${LOG_OUTPUTn_TYPE}
diff --git a/net/templates/osmo-msc2.cfg b/net/templates/osmo-msc2.cfg
new file mode 100644
index 0000000..86813c4
--- /dev/null
+++ b/net/templates/osmo-msc2.cfg
@@ -0,0 +1,48 @@
+${include(common_template_warning)}
+line vty
+ bind ${MSC2_VTY_CTRL_IP}
+ctrl
+ bind ${MSC2_VTY_CTRL_IP}
+sgs
+ local-ip ${MSC2_VTY_CTRL_IP}
+
+cs7 instance 0
+ point-code ${MSC2_PC}
+network
+ network country code ${MCC}
+ mobile network code ${MNC}
+ authentication ${AUTH}
+ encryption a5 ${ENCR_A5}
+ short name 35c3
+ long name 35c3
+ mm info 1
+msc
+ nri add 0x200 0x3ff
+ mncc ${MSC2_MNCC}
+ mgw remote-ip ${MGW4MSC_IP}
+ mgw remote-port ${MGW4MSC_PORT}
+ mgw endpoint-domain msc
+ check-imei-rqd 1
+ # For nano3G:
+ iu rab-assign-addr-enc x213
+mncc-int
+ default-codec tch-f fr
+ default-codec tch-h amr
+smpp
+ local-tcp-ip 127.0.0.1 2775
+ system-id test-msc
+ policy closed
+ no smpp-first
+hlr
+ remote-ip ${HLR_IP}
+ ipa-name msc-2
+
+${foreach(LOG_OUTPUT)}
+log ${LOG_OUTPUTn_TYPE}
+${include(common_logging)}
+ 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-sip-connector.cfg b/net/templates/osmo-sip-connector.cfg
index 88aa5b7..84b91a6 100644
--- a/net/templates/osmo-sip-connector.cfg
+++ b/net/templates/osmo-sip-connector.cfg
@@ -1,4 +1,6 @@
 ${include(common_template_warning)}
+line vty
+ bind ${MSC_VTY_CTRL_IP}
 app
 mncc
   socket-path ${MSC_MNCC_SOCKET}
diff --git a/net/templates/osmo-sip-connector2.cfg b/net/templates/osmo-sip-connector2.cfg
new file mode 100644
index 0000000..1ac29e8
--- /dev/null
+++ b/net/templates/osmo-sip-connector2.cfg
@@ -0,0 +1,14 @@
+${include(common_template_warning)}
+line vty
+ bind ${MSC2_VTY_CTRL_IP}
+app
+mncc
+  socket-path ${MSC2_MNCC_SOCKET}
+sip
+  local ${SIPCON2_SIP} ${SIPCON2_SIP_PORT}
+  remote ${PBX_SIP} ${PBX_SIP_PORT}
+
+${foreach(LOG_OUTPUT)}
+log ${LOG_OUTPUTn_TYPE}
+${include(common_logging)}
+${foreach_end}
diff --git a/net/templates/run.sh b/net/templates/run.sh
index f8d18b9..5bcc9e7 100755
--- a/net/templates/run.sh
+++ b/net/templates/run.sh
@@ -72,6 +72,7 @@ hnbgw="osmo-hnbgw"
 # - the tee saves the stderr logging as well as the udtrace output to new file current_log/osmo-msc.out, since udtrace
 #   will not show in osmo-msc.log
 msc="LD_LIBRARY_PATH=/usr/lib/titan LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libasan.so.5:/n/s/udtrace/libudtrace.so osmo-msc 2>&1 | tee -a current_log/osmo-msc.out"
+msc2="LD_LIBRARY_PATH=/usr/lib/titan LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libasan.so.5:/n/s/udtrace/libudtrace.so osmo-msc -c osmo-msc2.cfg 2>&1 | tee -a current_log/osmo-msc2.out"
 gbproxy="osmo-gbproxy"
 sgsn="osmo-sgsn"
 ggsn="osmo-ggsn"
@@ -114,6 +115,10 @@ if [ "x${MSC_MNCC}" != "xinternal" ]; then
   esac
 fi
 
+if [ "x${MSC2_MNCC}" != "xinternal" ]; then
+  sipcon2="osmo-sip-connector -c osmo-sip-connector2.cfg"
+fi
+
 sudo tcpdump -i $dev -n -w current_log/$dev.single.pcap -U not port 22 &
 sudo tcpdump -i lo -n -w current_log/lo.single.pcap -U not port 22 &
 
@@ -132,6 +137,8 @@ sleep .2
 term "$mgw4bsc" MGW4BSC &
 sleep .2
 term "$msc" MSC &
+sleep .2
+term "$msc2" MSC2 &
 sleep 2
 term "$hnbgw" HNBGW &
 sleep .2
@@ -147,6 +154,11 @@ if [ "x${MSC_MNCC}" != "xinternal" ]; then
   esac
 fi
 
+if [ "x${MSC2_MNCC}" != "xinternal" ]; then
+  sleep .2
+  term "$sipcon2" SIPCON2 &
+fi
+
 #ssh bts rm /tmp/bts.log /tmp/pcu.log
 #ssh bts neels/run_remote.sh &
 
@@ -156,7 +168,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 %16
 killall osmo-msc
 killall osmo-bsc
 killall osmo-gbproxy