Created version compatible with Android Studio