Revision and add of for-each