more modifications for Android