To reflect latest PR

Shouldn't require any more updates after this.