Removed auto pair and added super tab