Made updates to code to replace on with this.own(on) per the code review.