Iterators almost fixed
Iterators almost fixed