Added in a few changes.