Modify to work with Android Studio