first part of Terry's proofreading
merge