manual merge of tom's edits