No more need to refactor this.