diff --git a/android/build.gradle b/android/build.gradle
index 1ae98b6..a6dc7ae 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -13,7 +13,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         minSdkVersion 16
diff --git a/android/src/main/java/com/rnopentok/RNOpenTokModule.java b/android/src/main/java/com/rnopentok/RNOpenTokModule.java
index 157c6da..b19d91b 100644
--- a/android/src/main/java/com/rnopentok/RNOpenTokModule.java
+++ b/android/src/main/java/com/rnopentok/RNOpenTokModule.java
@@ -1,5 +1,7 @@
 package com.rnopentok;
 
+import android.util.Log;
+
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
@@ -14,6 +16,7 @@ public RNOpenTokModule(ReactApplicationContext context) {
         super(context);
 
         RNOpenTokSessionManager.initSessionManager(context);
+        RNOpenTokSessionManager.getSessionManager().disconnectAllSessions();
         reactContext = context;
     }
 
@@ -27,6 +30,7 @@ public void connect(String sessionId, String token, Promise promise) {
         Session session = RNOpenTokSessionManager.getSessionManager().connectToSession(sessionId, token);
         session.setSessionListener(RNOpenTokSessionManager.getSessionManager());
         session.setSignalListener(RNOpenTokSessionManager.getSessionManager());
+        Log.d("blabla", String.valueOf(session));
         promise.resolve(Boolean.valueOf(true));
     }
 
diff --git a/android/src/main/java/com/rnopentok/RNOpenTokSessionManager.java b/android/src/main/java/com/rnopentok/RNOpenTokSessionManager.java
index 5876d98..0a08fc0 100644
--- a/android/src/main/java/com/rnopentok/RNOpenTokSessionManager.java
+++ b/android/src/main/java/com/rnopentok/RNOpenTokSessionManager.java
@@ -2,6 +2,7 @@
 
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.util.Log;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
@@ -43,15 +44,31 @@ static RNOpenTokSessionManager initSessionManager(ReactApplicationContext contex
                 e.printStackTrace();
             }
             instance = new RNOpenTokSessionManager(context, apiKey);
+        } else if ( context != null && instance.getContext() != context) {
+            instance.setContext(context);
         }
         return instance;
     }
 
+    public ReactApplicationContext getContext() {
+        Log.d("blabla", String.valueOf(this.mContext));
+        return this.mContext;
+    }
+
+    public void setContext(ReactApplicationContext context) {
+        this.mContext = context;
+    }
+
     static RNOpenTokSessionManager getSessionManager() {
         return RNOpenTokSessionManager.initSessionManager(null);
     }
 
     public Session connectToSession(String sessionId, String token) {
+//        this.disconnectSession(sessionId);
+//        if (this.mSessions.get(sessionId) != null) {
+//            this.mSessions.get(sessionId).disconnect();
+//            this.mSessions.remove(sessionId);
+//        }
         Session session = new Session(this.mContext, this.mApiKey, sessionId);
         session.connect(token);
         this.mSessions.put(sessionId, session);
diff --git a/example/App.js b/example/App.js
index 0fa1faa..11c937f 100644
--- a/example/App.js
+++ b/example/App.js
@@ -7,9 +7,10 @@ import OpenTok, { Publisher } from "react-native-opentok"; // eslint-disable-lin
 
 import type { Ref } from 'react';
 
-const sessionId = 'YOUR_SESSION_ID';
-const token = 'YOUR_TOKEN';
-
+const sessionId =
+  '1_MX40NTk1NTk5Mn5-MTUxMjA2NTAxODU3N34yeHJ6K0JaZ3gxYmRwbWs3WFpLUEp0akt-fg';
+const token =
+  'T1==cGFydG5lcl9pZD00NTk1NTk5MiZzZGtfdmVyc2lvbj1kZWJ1Z2dlciZzaWc9Zjg2ZjAyZGMxMmM3NTIyMmM2YTViN2RjMTA0MWMyNzk4ZTk5NjhjYzpzZXNzaW9uX2lkPTFfTVg0ME5UazFOVGs1TW41LU1UVXhNakEyTlRBeE9EVTNOMzR5ZUhKNkswSmFaM2d4WW1Sd2JXczNXRnBMVUVwMGFrdC1mZyZjcmVhdGVfdGltZT0xNTEyMDY1MDE4JnJvbGU9cHVibGlzaGVyJm5vbmNlPTE1MTIwNjUwMTguNjAxMTEzNTc1MDExNyZleHBpcmVfdGltZT0xNTE0NjU3MDE4';
 export default class App extends Component<{}> {
   /* $FlowFixMe we ignore the fact that componentWillMount shouldn't be async. Just for example purposes */
   async componentWillMount() {
@@ -17,6 +18,10 @@ export default class App extends Component<{}> {
     OpenTok.on(OpenTok.events.ON_SIGNAL_RECEIVED, e => console.log(e));
   }
 
+  // async componentWillUnmount() {
+  //   await OpenTok.disconnect(sessionId);
+  // }
+
   ref: Ref<typeof Publisher>;
 
   render() {
@@ -24,27 +29,25 @@ export default class App extends Component<{}> {
       <View style={styles.container}>
         <Button
           onPress={async () => {
-            const isSent = await OpenTok.sendSignal(sessionId, 'message', 'a');
-            console.log(isSent);
+            await OpenTok.sendSignal(sessionId, 'message', 'a');
           }}
           title="Send signal"
         />
 
         <Button
           onPress={() => {
-            if (typeof this.ref !== 'string') this.ref.switchCamera();
+            OpenTok.removeListener(OpenTok.events.ON_SIGNAL_RECEIVED);
           }}
-          title="Switch camera"
+          title="rem list"
         />
-
+        {/* 
         <Publisher
           sessionId={sessionId}
           style={{ height: 100, width: 200, backgroundColor: 'black' }}
           ref={ref => {
-            /* $FlowFixMe */
             this.ref = ref;
           }}
-        />
+        /> */}
       </View>
     );
   }
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index 3c465c8..8f67e3c 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -95,7 +95,7 @@ def enableProguardInReleaseBuilds = false
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         applicationId "com.example"
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index 4333942..242bb32 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -27,6 +27,6 @@
         </intent-filter>
       </activity>
       <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
-      <meta-data android:name="OPENTOK_API_KEY" android:value="YOUR_OPENTOK_API_KEY" />
+      <meta-data android:name="OPENTOK_API_KEY" android:value="45955992" />
     </application>
 </manifest>
diff --git a/example/android/build.gradle b/example/android/build.gradle
index 0fa76c8..5f368cf 100644
--- a/example/android/build.gradle
+++ b/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
index dbdc05d..a89f60f 100644
--- a/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Thu Nov 30 19:58:02 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/src/index.js b/src/index.js
index 0ec2baf..f7b196f 100644
--- a/src/index.js
+++ b/src/index.js
@@ -87,6 +87,7 @@ export default {
   on: (name: OpenTokEvent, callback: RNOpenTokEventCallback): void => {
     if (listeners[name]) {
       listeners[name].remove();
+      delete listeners[name];
     }
     listeners[name] = NativeEventEmitter.addListener(name, callback);
   },