Updated before refactor