Change how to handle a dates