Changed to make use of this.