updated for tabs