much improved iteration
Merge branch 'test'