changes for Android