Merging in Steve's changes