Converted all date management to ISO format ATTEMPT 0