Added the new tabs and optimized