Updated for the date col issue.