Update to check date format