Great, if you want to make that change and update the tests I think we can merge this.