Added check when date range is negative... need to fix to keep the old dates in that case