Dates are now working correctly