Changes to Android version to match iOS