Use date instead of today string