fixed tense issue and handles negatives