Changes for Android