change the for loop to a new for range - part 1

change the for loop to a new for range - part 1 #3683