diff --git a/cassini-demo/README.md b/cassini-demo/README.md
index ac1fa08..13f6a9a 100644
--- a/cassini-demo/README.md
+++ b/cassini-demo/README.md
@@ -16,12 +16,12 @@
 
 ## Cables
 * 2x 40G QSP828+ Robofiber QSFP-40G-03C QSFP+ 40G direct attach passive copper cable, 3m length - S/N: QSFP-40G-03C
-* 1x Optical Fiber for Oclaro Cards
+* 1x Optical Fiber for Lumentum Cards
 * 6x 1g Management copper cables
 
 
 ## Software needed
-Required Ubuntu 16.04 or 18.04 and bazel 0.19.2 or higher.
+Required Ubuntu 16.04 or 18.04 and bazel 0.23.0 or higher.
 ```
 cd ~
 ```
@@ -33,12 +33,17 @@
 ```
 git clone https://github.com/opennetworkinglab/onos
 ```
+Go on 2.0 Branch
+```
+git checkout origin/onos-2.0
+```
 
 ## Demo setup on server
 ```
 cd ~/odtn-demo/cassini-demo
 ```
-### Setup network namespace for 2 hosts
+### OPTIONAL: Setup network namespace for 2 hosts
+**Note: If you do not intend to pass traffic through the server and you have other means of traffic generation you can skip this part**
 ```
 sudo ./name-space.sh h1 ens6f0 2 10.0.0.1
 sudo ./name-space.sh h2 ens6f1 2 10.0.0.2
diff --git a/cassini-demo/config-onos.sh b/cassini-demo/config-onos.sh
index db7299a..39d2c33 100755
--- a/cassini-demo/config-onos.sh
+++ b/cassini-demo/config-onos.sh
@@ -8,6 +8,6 @@
 sleep 10
 onos-netcfg localhost openconfig-device-cassini-test-link.json
 sleep 2
-curl -X POST --user onos:rocks --header 'Content-Type: application/json' --header 'Accept: application/json' -d@h1.json http://10.172.0.2:8181/onos/v1/hosts
+curl -X POST --user onos:rocks --header 'Content-Type: application/json' --header 'Accept: application/json' -d@h1.json http://10.128.200.1:8181/onos/v1/hosts
 sleep 2
-curl -X POST --user onos:rocks --header 'Content-Type: application/json' --header 'Accept: application/json' -d@h2.json http://10.172.0.2:8181/onos/v1/hosts
+curl -X POST --user onos:rocks --header 'Content-Type: application/json' --header 'Accept: application/json' -d@h2.json http://10.128.200.1:8181/onos/v1/hosts
diff --git a/cassini-demo/h1.json b/cassini-demo/h1.json
index cc6a37d..cce0a3e 100644
--- a/cassini-demo/h1.json
+++ b/cassini-demo/h1.json
@@ -6,7 +6,7 @@
   ],
   "locations": [
     {
-      "elementId": "netconf:10.172.0.11:830",
+      "elementId": "netconf:10.128.200.2:830",
       "port": "101"
     }
   ]
diff --git a/cassini-demo/h2.json b/cassini-demo/h2.json
index 7a83495..70f3b4f 100644
--- a/cassini-demo/h2.json
+++ b/cassini-demo/h2.json
@@ -6,7 +6,7 @@
   ],
   "locations": [
     {
-      "elementId": "netconf:10.172.0.12:830",
+      "elementId": "netconf:10.128.200.3:830",
       "port": "101"
     }
   ]
diff --git a/cassini-demo/openconfig-device-cassini-test-link.json b/cassini-demo/openconfig-device-cassini-test-link.json
index 67fb641..c52dfc2 100644
--- a/cassini-demo/openconfig-device-cassini-test-link.json
+++ b/cassini-demo/openconfig-device-cassini-test-link.json
@@ -1,12 +1,12 @@
 {
     "links": {
-        "netconf:10.172.0.11:830/201-netconf:10.172.0.12:830/202": {
+        "netconf:10.128.200.2:830/201-netconf:10.128.200.3:830/202": {
             "basic" : {
                 "type": "OPTICAL",
                 "metric": 1
             }
         },
-        "netconf:10.172.0.11:830/202-netconf:10.172.0.12:830/201": {
+        "netconf:10.128.200.3:830/202-netconf:10.128.200.2:830/201": {
             "basic" : {
                 "type": "OPTICAL",
                 "metric": 1
diff --git a/cassini-demo/openconfig-device-cassini-test1.json b/cassini-demo/openconfig-device-cassini-test1.json
index 727f524..9691ed1 100644
--- a/cassini-demo/openconfig-device-cassini-test1.json
+++ b/cassini-demo/openconfig-device-cassini-test1.json
@@ -1,12 +1,12 @@
 {
   "devices" : {
-    "netconf:10.172.0.11:830" : {
+    "netconf:10.128.200.2:830" : {
       "basic" : {
         "name":"cassini1",
 	"driver":"cassini-ocnos"
       },
       "netconf" : {
-        "ip" : "10.172.0.11",
+        "ip" : "10.128.200.2",
         "port" : "830",
         "username" : "root",
         "password" : "cobbler",
diff --git a/cassini-demo/openconfig-device-cassini-test2.json b/cassini-demo/openconfig-device-cassini-test2.json
index e27b113..17e37d5 100644
--- a/cassini-demo/openconfig-device-cassini-test2.json
+++ b/cassini-demo/openconfig-device-cassini-test2.json
@@ -1,12 +1,12 @@
 {
   "devices" : {
-    "netconf:10.172.0.12:830" : {
+    "netconf:10.128.200.3:830" : {
       "basic" : {
         "name":"cassini2",
 	"driver":"cassini-ocnos"
       },
       "netconf" : {
-        "ip" : "10.172.0.12",
+        "ip" : "10.128.200.3",
         "port" : "830",
         "username" : "root",
         "password" : "cobbler",