Updating before refactor