Refactored another tab