Updated with new date format