Refs #1 - More changes.