More API changes
fixed for loop