Use upto instead of ranges