Updated for Android 1.0