Change two more xrange to range