diff --git a/android/dist/TiMixpanel.jar b/android/dist/TiMixpanel.jar
new file mode 100644
index 0000000..5f08e5f
Binary files /dev/null and b/android/dist/TiMixpanel.jar differ
diff --git a/android/dist/se.hyperlab.mixpanel-android-0.1.zip b/android/dist/se.hyperlab.mixpanel-android-0.1.zip
deleted file mode 100644
index 71a3d94..0000000
Binary files a/android/dist/se.hyperlab.mixpanel-android-0.1.zip and /dev/null differ
diff --git a/android/dist/se.hyperlab.mixpanel-android-0.2.zip b/android/dist/se.hyperlab.mixpanel-android-0.2.zip
deleted file mode 100644
index a691e93..0000000
Binary files a/android/dist/se.hyperlab.mixpanel-android-0.2.zip and /dev/null differ
diff --git a/android/dist/se.hyperlab.mixpanel-android-0.3.zip b/android/dist/se.hyperlab.mixpanel-android-0.3.zip
deleted file mode 100644
index 9e06463..0000000
Binary files a/android/dist/se.hyperlab.mixpanel-android-0.3.zip and /dev/null differ
diff --git a/android/dist/se.hyperlab.mixpanel-android-0.4.zip b/android/dist/se.hyperlab.mixpanel-android-0.4.zip
deleted file mode 100644
index be612ed..0000000
Binary files a/android/dist/se.hyperlab.mixpanel-android-0.4.zip and /dev/null differ
diff --git a/android/dist/se.hyperlab.mixpanel-android-0.5.zip b/android/dist/se.hyperlab.mixpanel-android-0.5.zip
deleted file mode 100644
index 750ba7f..0000000
Binary files a/android/dist/se.hyperlab.mixpanel-android-0.5.zip and /dev/null differ
diff --git a/android/dist/se.hyperlab.mixpanel-android-0.6.zip b/android/dist/se.hyperlab.mixpanel-android-0.6.zip
deleted file mode 100644
index 7176eb5..0000000
Binary files a/android/dist/se.hyperlab.mixpanel-android-0.6.zip and /dev/null differ
diff --git a/android/dist/se.hyperlab.mixpanel-android-0.7.zip b/android/dist/se.hyperlab.mixpanel-android-0.7.zip
deleted file mode 100644
index b1effbd..0000000
Binary files a/android/dist/se.hyperlab.mixpanel-android-0.7.zip and /dev/null differ
diff --git a/android/dist/se.hyperlab.mixpanel-android-0.8.zip b/android/dist/se.hyperlab.mixpanel-android-0.8.zip
deleted file mode 100644
index ba646a4..0000000
Binary files a/android/dist/se.hyperlab.mixpanel-android-0.8.zip and /dev/null differ
diff --git a/android/dist/se.hyperlab.mixpanel-android-0.9.zip b/android/dist/se.hyperlab.mixpanel-android-0.9.zip
deleted file mode 100644
index 50a1a09..0000000
Binary files a/android/dist/se.hyperlab.mixpanel-android-0.9.zip and /dev/null differ
diff --git a/android/dist/se.hyperlab.mixpanel-android-2.1.0.zip b/android/dist/se.hyperlab.mixpanel-android-2.1.0.zip
new file mode 100644
index 0000000..a1da8ce
Binary files /dev/null and b/android/dist/se.hyperlab.mixpanel-android-2.1.0.zip differ
diff --git a/android/dist/timixpanel.jar b/android/dist/timixpanel.jar
deleted file mode 100644
index 1b93d1f..0000000
Binary files a/android/dist/timixpanel.jar and /dev/null differ
diff --git a/android/lib/mixpanel-android-4.4.1.jar b/android/lib/mixpanel-android-4.4.1.jar
deleted file mode 100644
index 385b1d3..0000000
Binary files a/android/lib/mixpanel-android-4.4.1.jar and /dev/null differ
diff --git a/android/lib/mixpanel-android-5.6.5.aar b/android/lib/mixpanel-android-5.6.5.aar
new file mode 100644
index 0000000..297ee5d
Binary files /dev/null and b/android/lib/mixpanel-android-5.6.5.aar differ
diff --git a/android/manifest b/android/manifest
index 9503dcd..d666124 100644
--- a/android/manifest
+++ b/android/manifest
@@ -2,20 +2,17 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 0.9
-apiversion: 2
+version: 2.1.0
+apiversion: 4
+architectures: arm64-v8a armeabi-v7a x86
 description: Mixpanel integration for Titanium Mobile
 author: Jonatan Lundin
 license: MIT
 copyright: Copyright (C) 2014-2015 Hyperlab AB
-architectures: armeabi;armeabi-v7a;x86
 
 # these should not be edited
 name: TiMixpanel
 moduleid: se.hyperlab.mixpanel
 guid: 7031f78e-4cf3-4b12-98f0-99325bd1987e
 platform: android
-minsdk: 3.2.2.GA
-
-# Build Mixpanel SDK, to not conflict with Titanium's R.java
-respackage: com.mixpanel.android
+minsdk: 8.0.0
diff --git a/android/src/se/hyperlab/mixpanel/TimixpanelModule.java b/android/src/se/hyperlab/mixpanel/TimixpanelModule.java
index 91a3b1f..9fc7185 100644
--- a/android/src/se/hyperlab/mixpanel/TimixpanelModule.java
+++ b/android/src/se/hyperlab/mixpanel/TimixpanelModule.java
@@ -174,21 +174,11 @@ public void addPushDeviceToken(String token) {
 		Log.d(TAG, "This function is not needed on Android");
 	}
     
-    @Kroll.method
-    public void showSurveyIfAvailable() {
-        mixpanel.getPeople().showSurveyIfAvailable(TiApplication.getAppCurrentActivity());
-    }
-    
     @Kroll.method
     public void showNotificationIfAvailable() {
         mixpanel.getPeople().showNotificationIfAvailable(TiApplication.getAppCurrentActivity());
     }
     
-    @Kroll.method
-    public void showSurveyById(@Kroll.argument int id) {
-        mixpanel.getPeople().showSurveyById(id, TiApplication.getAppCurrentActivity());
-    }
-    
     @Kroll.method
     public void showNotificationById(@Kroll.argument int id) {
         mixpanel.getPeople().showNotificationById(id, TiApplication.getAppCurrentActivity());
@@ -199,6 +189,11 @@ public void flush() {
 		mixpanel.flush();
 	}
 
+	@Kroll.method
+	public void reset() {
+		mixpanel.reset();
+	}
+
 	// Properties
 	@Kroll.getProperty
 	public String distinctId()