changed tense where appropriate, not done