updated WITH_FUTURE_DATES