add better date handling