code updates for Android