Fixing loitering, changing Iterator to match project spec