Changes to iterator