another "foreach" optimization, pre-test commit