Merge branch 'change-for-loop' into fixes