Updated for re implementing new tab