Reworking this.