More changes for the iteration loop