Change to using this.data