Third tab refactor 2