Merged with chris's edits.