Moved the dateFormat