Cleaned up working tabs