use a for loop instead of a while loop
Merge branch 'ShabihsBranch'