modifies logic for new date format