Replaced all dates  to be Date type with format