Modifications for Android