updated for android tab with modification