updated for date string