Replace timeAdd and timeSubstract with DateTime