Second refactor