diff --git a/package.json b/package.json
index f67decccc5..af740ec93d 100644
--- a/package.json
+++ b/package.json
@@ -41,6 +41,7 @@
   "dependencies": {
     "libp2p-ping": "~0.3.1",
     "libp2p-swarm": "~0.26.17",
+    "libp2p-circuit": "~0.0.1",
     "mafmt": "^2.1.6",
     "multiaddr": "^2.2.1",
     "peer-book": "~0.3.1",
@@ -54,4 +55,4 @@
     "greenkeeperio-bot <support@greenkeeper.io>",
     "mayerwin <mayerwin@users.noreply.github.com>"
   ]
-}
\ No newline at end of file
+}
diff --git a/src/index.js b/src/index.js
index 47984055ce..a32d755ef9 100644
--- a/src/index.js
+++ b/src/index.js
@@ -10,6 +10,7 @@ const EE = require('events').EventEmitter
 const assert = require('assert')
 const Ping = require('libp2p-ping')
 const setImmediate = require('async/setImmediate')
+const series = require('async/series')
 
 exports = module.exports
 
@@ -41,6 +42,9 @@ class Node {
       // If muxer exists, we can use Identify
       this.swarm.connection.reuse()
 
+      // If muxer exists, we can use Relay
+      this.swarm.connection.relay()
+
       // Received incommind dial and muxer upgrade happened, reuse this
       // muxed connection
       this.swarm.on('peer-mux-established', (peerInfo) => {
@@ -100,7 +104,7 @@ class Node {
         this.swarm.transport.add(
           transport.tag || transport.constructor.name, transport)
       } else if (transport.constructor &&
-                 transport.constructor.name === 'WebSockets') {
+        transport.constructor.name === 'WebSockets') {
         // TODO find a cleaner way to signal that a transport is always
         // used for dialing, even if no listener
         ws = transport
@@ -119,7 +123,8 @@ class Node {
 
       if (this.modules.discovery) {
         this.modules.discovery.forEach((discovery) => {
-          setImmediate(() => discovery.start(() => {}))
+          setImmediate(() => discovery.start(() => {
+          }))
         })
       }
 
@@ -135,11 +140,14 @@ class Node {
 
     if (this.modules.discovery) {
       this.modules.discovery.forEach((discovery) => {
-        setImmediate(() => discovery.stop(() => {}))
+        setImmediate(() => discovery.stop(() => {
+        }))
       })
     }
 
-    this.swarm.close(callback)
+    series([
+      (cb) => this.swarm.close(cb)
+    ], callback)
   }
 
   //