Second attempt, added patch for date-range issue.