New way to handle this.