incorporating suzannes changes, 1