Team refactor 1