Updated with more tabs