Changes to accommodate using Android Studio