Updated for Android Tab