Add editor changes for date fix