Changes Updated for Android Version