Changed back to for loop