Changes from a few runs of this.