More changes for looping