New version

Reuqires use of iterator
Kept old version as a 'choice' for developers