Changed Iterator strategy