fix the logic and the tense