Added in G. Christian's style changes.