Second refactoring call