Updated for date format