switched to forEach iteration; issue #20