Merging in Dave's changes.