I have modified the other code to be consistent with this.