Started to fix the DATE issue.